jjb: xci: Make use of alternative ssh configuration file

[releng.git] / jjb / xci / xci-verify-jobs.yml

diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index ff3c689..1fde17a 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -281,14 +281,15 @@
           export INSTALLER_TYPE=$INSTALLER_TYPE
           export GIT_BASE=$GIT_BASE
           export JENKINS_HOME=$JENKINS_HOME
-          export XCI_BUILD_CLEAN_VM_OS=false
-          export XCI_UPDATE_CLEAN_VM_OS=true
 
           cd xci
           ./xci-deploy.sh
           EOF
           chmod a+x xci_test.sh
 
+          export XCI_BUILD_CLEAN_VM_OS=false
+          export XCI_UPDATE_CLEAN_VM_OS=true
+
           ./xci/scripts/vm/start-new-vm.sh $DISTRO
       - shell: |
           #!/bin/bash
@@ -299,7 +300,7 @@
               exit 0
           fi
 
-          ssh ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
+          ssh -F $HOME/.ssh/xci-vm-config ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
 
 
 - builder: