use `bash` to parse shell

[releng.git] / jjb / compass4nfv / compass-verify-jobs.yaml

diff --git a/jjb/compass4nfv/compass-verify-jobs.yaml b/jjb/compass4nfv/compass-verify-jobs.yaml
index c357ff6..daedff7 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yaml
+++ b/jjb/compass4nfv/compass-verify-jobs.yaml
@@ -14,14 +14,14 @@
           gs-pathname: ''
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'pike'
+          openstack-version: 'queens'
           branch-type: 'master'
-      - fraser:
+      - gambia:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           ppa-pathname: '/{stream}'
           disabled: false
-          openstack-version: 'pike'
+          openstack-version: 'queens'
           branch-type: 'master'
 
     distro:
@@ -71,7 +71,7 @@
             - 'compass-verify-[^-]*-[^-]*'
             - 'compass-os-.*?-virtual-daily-.*?'
             - 'compass-k8-.*?-virtual-daily-.*?'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - ssh-agent-wrapper
@@ -162,15 +162,6 @@
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: true
-            - name: 'functest-compass-virtual-suite-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                FUNCTEST_MODE=testcase
-                FUNCTEST_SUITE_NAME=vping_ssh
-                DEPLOY_SCENARIO=os-nosdn-nofeature-ha
-              node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: true
 
 - job-template:
     name: 'compass-verify-k8-{distro}-{stream}'
@@ -193,7 +184,7 @@
           blocking-jobs:
             - 'compass-verify-[^-]*-[^-]*'
             - 'compass-os-.*?-virtual-daily-.*?'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - ssh-agent-wrapper
@@ -288,7 +279,7 @@
             - 'compass-os-.*?-virtual-daily-.*?'
             - 'compass-verify-deploy-.*'
             - 'functest-compass-virtual.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - ssh-agent-wrapper
@@ -343,7 +334,7 @@
           description: "URL to Google Storage."
       - string:
           name: PPA_REPO
-          default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
+          default: "https://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
       - string:
           name: PPA_CACHE
           default: "$WORKSPACE/work/repo/"