From: Markos Chandras <mchandras@suse.de>
Date: Thu, 14 Dec 2017 15:15:14 +0000 (+0000)
Subject: jjb: xci: Use the correct SSH configuration file
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=ef537c1ebf7a46b884abb82f1e6a54483f07b93b

jjb: xci: Use the correct SSH configuration file

We need to use the XCI specific SSH configuration file so rsync can
tranfer the working directory to the virtual machine. This also
drop the ironic command like we do in the XCI jobs.

Change-Id: I10ce38db6777d5dbfbe62961c88b3902de2160e2
Signed-off-by: Markos Chandras <mchandras@suse.de>
---

diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index 263f544ad..198f2e1c7 100755
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -25,9 +25,6 @@ cd ~/bifrost
 # provision 3 VMs; xcimaster, controller, and compute
 ./scripts/bifrost-provision.sh
 
-# list the provisioned VMs
-source env-vars
-ironic node-list
 sudo -H -E virsh list
 EOF
 chmod a+x bifrost_test.sh
@@ -44,6 +41,6 @@ export XCI_UPDATE_CLEAN_VM_OS=true
 
 ./xci/scripts/vm/start-new-vm.sh $VM_DISTRO
 
-rsync -a $WORKSPACE/ ${VM_DISTRO}_xci_vm:~/bifrost
+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"