diff options
| author | Simo Fรคlt <simo.falt@digia.com> | 2013-10-11 16:08:17 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 15:13:47 +0200 |
| commit | 117f5febf99366eaf54dbb05b93f97a07eaa04af (patch) | |
| tree | f6a42797972d79c9c59eed5cf820fc6e3509a65b | |
| parent | c39631feb291d922aa8b7b3c311169091556d1fa (diff) | |
Revert "Jenkins_slave connects to current hostname instead of fixed"
This reverts commit 4bd4e5eea61a51cca6bdaabbd77024d7079d0cf0.
Commit caused all CI's 10.8 nodes to go offline, while node couldn't
fetch the jnlp file.
Change-Id: Icd56fd36657cda52b1a551d244058f08c175eceb
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| -rwxr-xr-x | puppet/modules/jenkins_slave/templates/jenkins-slave.pl.erb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/modules/jenkins_slave/templates/jenkins-slave.pl.erb b/puppet/modules/jenkins_slave/templates/jenkins-slave.pl.erb index db53db2..938015b 100755 --- a/puppet/modules/jenkins_slave/templates/jenkins-slave.pl.erb +++ b/puppet/modules/jenkins_slave/templates/jenkins-slave.pl.erb @@ -47,7 +47,6 @@ use FindBin; use File::Spec::Functions; use LWP::UserAgent; use English qw( -no_match_vars ); -use Sys::Hostname; # True iff Windows my $WINDOWS = ($OSNAME =~ m{win32}i); @@ -59,7 +58,7 @@ my $JENKINS_SERVER = '<%= jenkins_server %>'; my $JENKINS_CWD = $FindBin::Bin; # Name of this Jenkins slave -my $JENKINS_SLAVE_NAME = hostname; +my $JENKINS_SLAVE_NAME = '<%= jenkins_slave_name %>'; # Remote slave.jar my $JENKINS_SLAVE_JAR_URL = "$JENKINS_SERVER/jnlpJars/slave.jar"; |