jjb: xci: Use the correct SSH configuration file

[releng.git] / jjb / xci / bifrost-verify.sh

diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index ef07309..198f2e1 100755 (executable)
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -11,33 +11,36 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-git clone https://git.openstack.org/openstack/bifrost $WORKSPACE/bifrost
 git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE/releng-xci
 
-# checkout the patch
-cd $CLONE_LOCATION
+cd $WORKSPACE
 git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD
 
 # combine opnfv and upstream scripts/playbooks
-/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/bifrost/
+/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/
 
 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
+export XCI_BUILD_CLEAN_VM_OS=false
+export XCI_UPDATE_CLEAN_VM_OS=true
 
-ssh ${DISTRO,,}_xci_vm "cd ~/bifrost && ./bifrost_test.sh"
+./xci/scripts/vm/start-new-vm.sh $VM_DISTRO
+
+rsync -a -e "ssh -F $HOME/.ssh/xci-vm-config" $WORKSPACE/ ${VM_DISTRO}_xci_vm:~/bifrost
+
+ssh -F $HOME/.ssh/xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost/releng-xci && ./bifrost_test.sh"