use `bash` to parse shell

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

diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml
index f93575d..cda7399 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yaml
+++ b/jjb/compass4nfv/compass-ci-jobs.yaml
@@ -54,7 +54,7 @@
       #        master
       # -------------------------------
       - baremetal-centos:
-          slave-label: 'intel-pod17'
+          slave-label: compass-baremetal-master
           os-version: 'centos7'
           <<: *master
       # -------------------------------
@@ -162,7 +162,7 @@
             - 'compass-os-.*?-baremetal-daily-.*?'
             - 'compass-k8-.*?-baremetal-daily-.*?'
             - 'compass-verify-[^-]*-[^-]*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - fix-workspace-permissions
@@ -219,6 +219,7 @@
       # only run on os-(nosdn|odl_l3)-nofeature-ha scenario
       # run with testsuite default, testarea mandatory, dovetail docker image with latest tag
       # run with testsuite default, testarea optional, dovetail docker image with latest tag
+      # run with testsuite proposed_tests, testarea optional, dovetail docker image with latest tag
       - conditional-step:
           condition-kind: and
           condition-operands:
@@ -238,14 +239,6 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: os-(nosdn|odl_l3)-nofeature-ha
-              label: '{scenario}'
-          steps:
-            - trigger-builds:
                 - project: 'dovetail-compass-{pod}-default-optional-{stream}'
                   current-parameters: false
                   predefined-parameters: |
@@ -257,6 +250,17 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
+                - project: 'dovetail-compass-{pod}-proposed_tests-optional-{stream}'
+                  current-parameters: false
+                  predefined-parameters: |
+                    DOCKER_TAG=latest
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
       - conditional-step:
           condition-kind: and
           condition-operands:
@@ -351,7 +355,7 @@
           blocking-jobs:
             - 'compass-deploy-{pod}-daily-.*?'
             - 'compass-verify-deploy-.*?'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name: