diff options
| author | Tony SarajΓ€rvi <tony.sarajarvi@digia.com> | 2013-10-07 12:18:47 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-10 08:38:19 +0200 |
| commit | 4bd4e5eea61a51cca6bdaabbd77024d7079d0cf0 (patch) | |
| tree | 35372129941f521726a70d76ba2045129bc002ed | |
| parent | 43efb2af809689b74eebd9f98ce3266f829616d2 (diff) | |
Jenkins_slave connects to current hostname instead of fixed
Previously Jenkins clients connected to Jenkins master using the
hostname written to the Perl script by Puppet. This change modifies
the behavior so, that the Perl script queries for the current
hostname and uses that to connect.
Change-Id: I86cad9fe14f179eb9dd5a18ce1eedc28e6184e07
Reviewed-by: Simo FΓ€lt <simo.falt@digia.com>
Reviewed-by: Heikki Halmet <heikki.halmet@digia.com>
| -rwxr-xr-x | puppet/modules/jenkins_slave/templates/jenkins-slave.pl.erb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/jenkins_slave/templates/jenkins-slave.pl.erb b/puppet/modules/jenkins_slave/templates/jenkins-slave.pl.erb index e7bc3f0..7db225e 100755 --- a/puppet/modules/jenkins_slave/templates/jenkins-slave.pl.erb +++ b/puppet/modules/jenkins_slave/templates/jenkins-slave.pl.erb @@ -47,6 +47,7 @@ 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); @@ -58,7 +59,7 @@ my $JENKINS_SERVER = '<%= jenkins_server %>'; my $JENKINS_CWD = $FindBin::Bin; # Name of this Jenkins slave -my $JENKINS_SLAVE_NAME = '<%= jenkins_slave_name %>'; +my $JENKINS_SLAVE_NAME = hostname; # Remote slave.jar my $JENKINS_SLAVE_JAR_URL = "$JENKINS_SERVER/jnlpJars/slave.jar"; |