From: mei mei <meimei@huawei.com>
Date: Wed, 18 Jul 2018 06:31:46 +0000 (+0000)
Subject: Merge "[dovetail] Run mandatory and optional test cases with 2 jobs"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4cb31b2b027b53c3eb7b5f8a8a4b230687999543;hp=91669b39a0a6023cee20578f49efe6e633738b06;p=releng.git

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

diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml
index 298173e85..337d63042 100644
--- 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