]> review.fuel-infra Code Review - tools/sustaining.git/commitdiff
Use jenkins hostname instead of local net ip 67/41067/1
authorVladimir Khlyunev <vkhlyunev@mirantis.com>
Tue, 16 Apr 2019 09:35:14 +0000 (13:35 +0400)
committerVladimir Khlyunev <vkhlyunev@mirantis.com>
Tue, 16 Apr 2019 09:35:14 +0000 (13:35 +0400)
Change-Id: Icc4a8c0345c27d443855dee1f291216180cba0b3

maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh

index bb707564839905514b148d84f6f7c69cdd9a761c..0429e790183bf7ba7c309c3ef63b6c5a137e807d 100644 (file)
@@ -55,7 +55,7 @@ echo "base-slave" > /etc/jenkins-agent/labels
 cat > /etc/jenkins-agent/config <<EOF
 fsroot=/home/jenkins
 labelsFile=/etc/jenkins-agent/labels
-master=http://10.10.0.4
+master=http://maintenance-ci.scc.mirantis.net
 username=${JJB_USER?}
 password=${JJB_PASS?}
 EOF
@@ -65,7 +65,7 @@ cat > /home/jenkins/launch_jenkins_agent.sh <<EOF
 source /etc/jenkins-agent/config
 java -jar /home/jenkins/jenkins-swarm-client.jar -fsroot \${fsroot:-/home/jenkins} \
                                                  -labelsFile /etc/jenkins-agent/labels \
-                                                 -master \${master:-http://10.10.0.4} \
+                                                 -master \${master:-http://maintenance-ci.scc.mirantis.net} \
                                                  -description "\$(cat /etc/jenkins-agent/description)" \
                                                  -disableClientsUniqueId \
                                                  -username \${username?} \
index 3949ea4a34c40f6544582675a1ac127c045065d5..8123cc5f1ff70844cfe4ad4855a8105cecfba921 100644 (file)
@@ -99,7 +99,7 @@ echo "mos-slave" > /etc/jenkins-agent/labels
 cat > /etc/jenkins-agent/config <<EOF
 fsroot=/home/jenkins
 labelsFile=/etc/jenkins-agent/labels
-master=http://10.10.0.4
+master=http://maintenance-ci.scc.mirantis.net
 username=${JJB_USER?}
 password=${JJB_PASS?}
 EOF
@@ -109,7 +109,7 @@ cat > /home/jenkins/launch_jenkins_agent.sh <<EOF
 source /etc/jenkins-agent/config
 java -jar /home/jenkins/jenkins-swarm-client.jar -fsroot \${fsroot:-/home/jenkins} \
                                                  -labelsFile /etc/jenkins-agent/labels \
-                                                 -master \${master:-http://10.10.0.4} \
+                                                 -master \${master:-http://maintenance-ci.scc.mirantis.net} \
                                                  -description "\$(cat /etc/jenkins-agent/description)" \
                                                  -disableClientsUniqueId \
                                                  -username \${username?} \