xci-verify: Remove flavor from the scenario name

[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 3b399a7..bf4e60e 100644 (file)
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -107,11 +107,6 @@
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
               disable-strict-forbidden-file-verification: 'true'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'bifrost/**'
-                - compare-type: ANT
-                  pattern: 'xci/**'
               forbidden-file-paths:
                 - compare-type: ANT
                   pattern: 'prototypes/**'
@@ -121,7 +116,10 @@
                   pattern: '**/README.rst'
                 - compare-type: ANT
                   pattern: 'docs/**'
+                - compare-type: ANT
+                  pattern: 'xci/scripts/vm/**'
           readable-message: true
+          custom-url: '* $JOB_NAME $BUILD_URL'
           skip-vote:
             successful: '{obj:successful}'
             failed: '{obj:failed}'
@@ -154,7 +152,7 @@
               current-parameters: true
               predefined-parameters: |
                 DISTRO={distro}
-                DEPLOY_SCENARIO=os-nosdn-nofeature-noha
+                DEPLOY_SCENARIO=os-nosdn-nofeature
                 CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -171,7 +169,7 @@
               current-parameters: true
               predefined-parameters: |
                 DISTRO={distro}
-                DEPLOY_SCENARIO=os-nosdn-nofeature-noha
+                DEPLOY_SCENARIO=os-nosdn-nofeature
                 CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
                 FUNCTEST_MODE=tier
                 FUNCTEST_TIER=healthcheck
@@ -195,8 +193,8 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'bifrost-verify-.*'
-            - 'bifrost-periodic-.*'
+            - '.*-bifrost-verify-.*'
+            - '.*-bifrost-periodic-.*'
             - 'osa-verify-.*'
             - 'osa-periodic-.*'
           block-level: 'NODE'
@@ -210,7 +208,7 @@
           default: 'ubuntu'
       - string:
           name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-noha'
+          default: 'os-nosdn-nofeature'
       - string:
           name: FUNCTEST_MODE
           default: 'tier'
@@ -287,17 +285,20 @@
           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
 
           # 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:
@@ -307,7 +308,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