jjb: xci: xci-verify-jobs: Enable tempest for XCI

[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 0a7b960..b1b868d 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -281,6 +281,7 @@
           export INSTALLER_TYPE=$INSTALLER_TYPE
           export GIT_BASE=$GIT_BASE
           export JENKINS_HOME=$JENKINS_HOME
+          export RUN_TEMPEST=true
 
           cd xci
           ./xci-deploy.sh
@@ -295,12 +296,12 @@
           #!/bin/bash
 
           # skip the deployment if the patch doesn't impact the deployment
-          if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
+          if [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment ]]; then
               echo "Skipping the deployment!"
               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:
@@ -310,7 +311,7 @@
           #!/bin/bash
 
           # skip the healthcheck if the patch doesn't impact the deployment
-          if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
+          if [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment ]]; then
               echo "Skipping the healthcheck!"
               exit 0
           fi