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 8c060ca86cf6c7c8f593dce5202490a504b80572..e19275648b9b2117e92569b225fb27dbe6199dcd 100644 (file)
--- 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 861dfb56382f1e11d8a99211304d4c4060f97f06..a3596ca50999adfc16882ddb49ca5311cec0fb28 100644 (file)
--- 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 ed055e48c7752f1cb3114be1d5839a477c2e57b7..c25f5bd77947d36a171652ccb1c9006100ce785d 100755 (executable)
--- 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