From: Vladimir Khlyunev <vkhlyunev@mirantis.com>
Date: Tue, 26 Feb 2019 08:49:26 +0000 (+0400)
Subject: Pass creds inside mounted image via file
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=eba16debd0f2fea353507fccaacde259d3ac2256;p=tools%2Fsustaining.git

Pass creds inside mounted image via file

Change-Id: Idac9dc6a36e725ae54dda297e9190dcff1187cdc
---

diff --git a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
index 8c060ca..e192756 100644
--- a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 set -ex
+
+if [[ -f /tmp/jjb_creds.sh ]] ; then
+source /tmp/jjb_creds.sh
+fi
+
 adduser --disabled-password --gecos "" jenkins
 echo "jenkins:jenkins" | chpasswd
 adduser jenkins sudo
diff --git a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
index 861dfb5..a3596ca 100644
--- a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 set -ex
+
+if [[ -f /tmp/jjb_creds.sh ]] ; then
+source /tmp/jjb_creds.sh
+fi
+
 adduser --disabled-password --gecos "" jenkins
 echo "jenkins:jenkins" | chpasswd
 adduser jenkins sudo
diff --git a/maintenance-ci/common/scripts/prepare_build_upload_image.sh b/maintenance-ci/common/scripts/prepare_build_upload_image.sh
index ed055e4..c25f5bd 100755
--- a/maintenance-ci/common/scripts/prepare_build_upload_image.sh
+++ b/maintenance-ci/common/scripts/prepare_build_upload_image.sh
@@ -44,6 +44,10 @@ sudo mv /mnt/image/etc/resolv.conf /mnt/image/etc/resolv.conf.bak
 sudo cp -f /etc/resolv.conf /mnt/image/etc/resolv.conf
 
 sudo cp "${UPDATE_SCRIPT}" /mnt/image/tmp/build_image.sh
+sudo cat > /mnt/image/tmp/jjb_creds.sh <<EOF
+JJB_USER=${JJB_USER}
+JJB_PASS=${JJB_PASS}
+EOF
 sudo chroot /mnt/image /bin/bash /tmp/build_image.sh