From 2e39f53a1c8d35f4f55361c0dcfb61ff327f60c3 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Fri, 6 Oct 2017 13:52:12 +0100
Subject: jjb: xci: bifrost: Enable jobs and use XCI ssh configuration

Enable the 'bifrost' jobs and also make use of the XCI specific
ssh configuration file.

Change-Id: I04d15610b596191622cf028b3408b4d63ee7090b
Signed-off-by: Markos Chandras <mchandras@suse.de>
---
 jjb/xci/bifrost-verify-jobs.yml |  8 ++++----
 jjb/xci/bifrost-verify.sh       | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'jjb')

diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index 5f0b6572a..f8d39b2fb 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -12,19 +12,19 @@
     # -------------------------------
     distro:
       - 'xenial':
-          disabled: true
+          disabled: false
           dib-os-release: 'xenial'
           dib-os-element: 'ubuntu-minimal'
           dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
           extra-dib-elements: 'openssh-server'
       - 'centos7':
-          disabled: true
+          disabled: false
           dib-os-release: '7'
           dib-os-element: 'centos-minimal'
           dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
           extra-dib-elements: 'openssh-server'
-      - 'suse':
-          disabled: true
+      - 'opensuse423':
+          disabled: false
           dib-os-release: '42.3'
           dib-os-element: 'opensuse-minimal'
           dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index ef0730938..a86ba91c3 100755
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -25,19 +25,24 @@ cd $WORKSPACE/releng-xci
 cat > bifrost_test.sh<<EOF
 cd ~/bifrost
 # provision 3 VMs; xcimaster, controller, and compute
-cd $WORKSPACE/bifrost
 ./scripts/bifrost-provision.sh
 
 # list the provisioned VMs
-cd $WORKSPACE/bifrost
 source env-vars
 ironic node-list
 sudo -H -E virsh list
 EOF
 chmod a+x bifrost_test.sh
 
-./xci/scripts/vm/start-new-vm.sh $DISTRO
+# Fix up distros
+case ${DISTRO} in
+	xenial) VM_DISTRO=ubuntu ;;
+	centos7) VM_DISTRO=centos ;;
+	*suse*) VM_DISTRO=opensuse ;;
+esac
 
-rsync -a $WORKSPACE/bifrost ${DISTRO,,}_xci_vm:~/bifrost
+./xci/scripts/vm/start-new-vm.sh $VM_DISTRO
 
-ssh ${DISTRO,,}_xci_vm "cd ~/bifrost && ./bifrost_test.sh"
+rsync -a $WORKSPACE/releng-xci ${VM_DISTRO}_xci_vm:~/bifrost
+
+ssh -F $HOME/.ssh/xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost && ./bifrost_test.sh"
-- 
cgit 1.2.3-korg