Merge "jjb: xci: Make use of alternative ssh configuration file"

diff --combined jjb/xci/xci-verify-jobs.yml
index 62b69fe,1fde17a..93ca187
--- 1/jjb/xci/xci-verify-jobs.yml
--- 2/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@@ -295,12 -295,12 +295,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 -310,7 +310,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