diff options
author | Markos Chandras <mchandras@suse.de> | 2017-09-25 20:40:11 +0100 |
---|---|---|
committer | Markos Chandras <mchandras@suse.de> | 2017-09-26 16:06:58 +0100 |
commit | 9f085a075309738af1f73a7617f604bd2af1604c (patch) | |
tree | 6b7e86f9da5aeaba1bc8994474874193c2ff18e7 /xci/scripts/vm/build-dib-os.sh | |
parent | e728ad6988a15c71376860b1ea6eaedcce15fa4e (diff) |
xci: scripts: Fix script to run on Jenkins CI
A couple of tweaks are necessary to get it working with Jenkins
- Jenkins jobs could contain the 'xci' string so make the regexp
more accurate.
- Rename VMs to use a more accurate name
- Fix ssh public key location
- Create a fresh /etc/hosts since distro may not have one.
- Set hostname on VM
Change-Id: I332a424bc8b2de98d7b326c192996b7b12c79dd7
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/scripts/vm/build-dib-os.sh')
-rwxr-xr-x | xci/scripts/vm/build-dib-os.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xci/scripts/vm/build-dib-os.sh b/xci/scripts/vm/build-dib-os.sh index 47d0a905..78eaff2d 100755 --- a/xci/scripts/vm/build-dib-os.sh +++ b/xci/scripts/vm/build-dib-os.sh @@ -13,8 +13,10 @@ set -e lsb_release -i | grep -q -i ubuntu || { echo "This script only works on Ubuntu distros"; exit 1; } declare -A flavors=( ["ubuntu-minimal"]="xenial" ["opensuse-minimal"]="42.3" ["centos-minimal"]="7" ) -elements="vm simple-init devuser growroot openssh-server" +declare -r elements="vm simple-init devuser growroot openssh-server" declare -r one_distro=${1} +declare -r BASE_PATH=$(dirname $(readlink -f $0) | sed "s@/xci/.*@@") + if [[ -n ${one_distro} ]]; then case ${one_distro} in centos|ubuntu|opensuse) : ;; @@ -26,7 +28,7 @@ fi echo "Configuring devuser..." export DIB_DEV_USER_USERNAME=devuser export DIB_DEV_USER_PWDLESS_SUDO=1 -export DIB_DEV_USER_AUTHORIZED_KEYS=$HOME/.ssh/id_rsa_for_dib.pub +export DIB_DEV_USER_AUTHORIZED_KEYS=${BASE_PATH}/xci/scripts/vm/id_rsa_for_dib.pub export DIB_DEV_USER_PASSWORD=linux echo "Installing base dependencies..." |