X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yaml;h=3a263d451460431f041191c26c8782fc9e53c1fc;hb=756f883cf0f477cfc9bd20776eb3bad49a4ff61e;hp=298173e859c0b29c80d07467286cfb9127589141;hpb=285ec6750bf88cc9a0f72d9eec91ff156f0ef02f;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yaml b/jjb/compass4nfv/compass-ci-jobs.yaml
index 298173e85..3a263d451 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yaml
+++ b/jjb/compass4nfv/compass-ci-jobs.yaml
@@ -129,6 +129,9 @@
       - 'k8-nosdn-stor4nfv-noha':
           disabled: false
           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-stor4nfv-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
       - 'compass-{scenario}-{pod}-daily-{stream}'
@@ -214,8 +217,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 +227,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 +246,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:
+                  predefined-parameters: |
+                    DOCKER_TAG=latest
                     DEPLOY_SCENARIO={scenario}
                   block: true
                   same-node: true
@@ -510,6 +514,10 @@
     name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-centos-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-stor4nfv-ha-baremetal-centos-master-trigger'
+    triggers:
+      - timed: ''
 
 # ----------------------------
 # noha-baremetal-centos-master
@@ -603,6 +611,10 @@
     name: 'compass-k8-nosdn-stor4nfv-ha-huawei-pod7-danube-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-stor4nfv-ha-huawei-pod7-danube-trigger'
+    triggers:
+      - timed: ''
 
 # ----------------------------
 # noha-huawei-pod7-danube
@@ -695,6 +707,10 @@
     name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-master-trigger'
     triggers:
       - timed: '0 16 1-29/2 * *'
+- trigger:
+    name: 'compass-os-nosdn-stor4nfv-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '0 20 1-29/2 * *'
 
 # ---------------------
 # noha-baremetal-master
@@ -787,6 +803,10 @@
     name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 7 2-30/2 * *'
+- trigger:
+    name: 'compass-os-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
+    triggers:
+      - timed: ''
 
 # ---------------------
 # noha-baremetal-fraser
@@ -879,6 +899,10 @@
     name: 'compass-k8-nosdn-stor4nfv-ha-virtual-master-trigger'
     triggers:
       - timed: '0 15 2-30/2 * *'
+- trigger:
+    name: 'compass-os-nosdn-stor4nfv-ha-virtual-master-trigger'
+    triggers:
+      - timed: '0 19 2-30/2 * *'
 
 # -------------------
 # noha-virtual-master
@@ -971,6 +995,10 @@
     name: 'compass-k8-nosdn-stor4nfv-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 15 1-29/2 * *'
+- trigger:
+    name: 'compass-os-nosdn-stor4nfv-ha-virtual-fraser-trigger'
+    triggers:
+      - timed: ''
 
 # -------------------
 # noha-virtual-fraser