[dovetail] Run mandatory and optional test cases with 2 jobs

JIRA: DOVETAIL-694

Change-Id: I19928d57c14f99e5c3ed7725fbe3476096b1674c
Signed-off-by: xudan <xudan16@huawei.com>

diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml
index 298173e..337d630 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yaml
+++ b/jjb/compass4nfv/compass-ci-jobs.yaml
@@ -214,8 +214,8 @@
               unstable-threshold: 'FAILURE'
       # here the stream means the SUT stream, dovetail stream is defined in its own job
       # only run on os-(nosdn|odl_l3)-nofeature-ha scenario
-      # run with testsuite default, dovetail docker image with latest tag(Monday, Tuesday)
-      # run with testsuite proposed_tests, dovetail docker image with latest tag(Thursday, Friday)
+      # run with testsuite default, testarea mandatory, dovetail docker image with latest tag
+      # run with testsuite default, testarea optional, dovetail docker image with latest tag
       - conditional-step:
           condition-kind: and
           condition-operands:
@@ -224,7 +224,7 @@
               label: '{scenario}'
           steps:
             - trigger-builds:
-                - project: 'dovetail-compass-{pod}-default-{stream}'
+                - project: 'dovetail-compass-{pod}-default-mandatory-{stream}'
                   current-parameters: false
                   predefined-parameters: |
                     DOCKER_TAG=latest
@@ -243,9 +243,10 @@
               label: '{scenario}'
           steps:
             - trigger-builds:
-                - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
+                - project: 'dovetail-compass-{pod}-default-optional-{stream}'
                   current-parameters: false
                   predefined-parameters:
+                    DOCKER_TAG=latest
                     DEPLOY_SCENARIO={scenario}
                   block: true
                   same-node: true