X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=44cb84d8eb1e9cf004cf5cdb7fdae8cb35df787c;hb=3a76d9e0aff0902c67cc6c22bed79f4a0a02211f;hp=5c5327016761d6a9be4ad4175a83f5dc7140ab36;hpb=c778ca0b11edd0da11e5ec2ce449dd72621d3af7;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 5c5327016..44cb84d8e 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -123,6 +123,15 @@
       - 'os-nosdn-bar-ha':
           disabled: false
           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-bar-noha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'k8-nosdn-stor4nfv-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'k8-nosdn-stor4nfv-noha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
       - 'compass-{scenario}-{pod}-daily-{stream}'
@@ -149,7 +158,9 @@
           use-build-blocker: true
           blocking-jobs:
             - 'compass-os-.*?-{pod}-daily-.*?'
+            - 'compass-k8-.*?-{pod}-daily-.*?'
             - 'compass-os-.*?-baremetal-daily-.*?'
+            - 'compass-k8-.*?-baremetal-daily-.*?'
             - 'compass-verify-[^-]*-[^-]*'
           block-level: 'NODE'
 
@@ -166,9 +177,7 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{scenario}'
+          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
@@ -280,6 +289,26 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
+                - project: 'bottlenecks-compass-posca_factor_multistack_storage_parallel-{pod}-daily-{stream}'
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
+                - project: 'bottlenecks-compass-posca_factor_soak_throughputs-{pod}-daily-{stream}'
+                  current-parameters: false
+                  predefined-parameters:
+                    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:
@@ -336,6 +365,7 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
+          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
@@ -382,6 +412,7 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
+          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
@@ -427,6 +458,17 @@
           name: LOG_DIRECTORY
           default: $WORKSPACE/log_output
           description: "Directory where the logs will be located upon the completion of the collection."
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
+          description: "Scenario to deploy with."
+      - string:
+          name: COMPASS_OS_VERSION
+          default: ''
+      - string:
+          name: COMPASS_OPENSTACK_VERSION
+          default: ''
+
 
 ########################
 # trigger macros
@@ -482,11 +524,15 @@
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 6 * * *'
 - trigger:
     name: 'compass-os-nosdn-bar-ha-baremetal-centos-master-trigger'
     triggers:
       - timed: ''  # '0 19 * * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-centos-master-trigger'
+    triggers:
+      - timed: ''
 
 # ----------------------------
 # noha-baremetal-centos-master
@@ -515,6 +561,15 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-centos-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-bar-noha-baremetal-centos-master-trigger'
+    triggers:
+      - timed: ''  # '0 19 * * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-centos-master-trigger'
+    triggers:
+      - timed: ''
+
 
 # --------------------------
 # ha-huawei-pod7-danube
@@ -571,6 +626,10 @@
     name: 'compass-os-nosdn-bar-ha-huawei-pod7-danube-trigger'
     triggers:
       - timed: ''  # '0 19 * * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-ha-huawei-pod7-danube-trigger'
+    triggers:
+      - timed: ''
 
 # ----------------------------
 # noha-huawei-pod7-danube
@@ -599,6 +658,14 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-huawei-pod7-danube-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-bar-noha-huawei-pod7-danube-trigger'
+    triggers:
+      - timed: ''  # '0 19 * * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-huawei-pod7-danube-trigger'
+    triggers:
+      - timed: ''
 
 # -------------------
 # ha-baremetal-master
@@ -646,7 +713,7 @@
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 10 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-ha-baremetal-master-trigger'
     triggers:
@@ -655,6 +722,10 @@
     name: 'compass-os-nosdn-bar-ha-baremetal-master-trigger'
     triggers:
       - timed: '0 2 2-30/2 * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-master-trigger'
+    triggers:
+      - timed: '0 16 1-29/2 * *'
 
 # ---------------------
 # noha-baremetal-master
@@ -683,6 +754,14 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-bar-noha-baremetal-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-master-trigger'
+    triggers:
+      - timed: ''
 
 # -------------------
 # ha-baremetal-euphrates
@@ -739,6 +818,10 @@
     name: 'compass-os-nosdn-bar-ha-baremetal-euphrates-trigger'
     triggers:
       - timed: '0 21 1-29/2 * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-euphrates-trigger'
+    triggers:
+      - timed: ''
 
 # ---------------------
 # noha-baremetal-euphrates
@@ -767,6 +850,14 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-bar-noha-baremetal-euphrates-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-euphrates-trigger'
+    triggers:
+      - timed: ''
 
 # -----------------
 # ha-virtual-master
@@ -823,6 +914,10 @@
     name: 'compass-os-nosdn-bar-ha-virtual-master-trigger'
     triggers:
       - timed: '0 17 1-29/2 * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-ha-virtual-master-trigger'
+    triggers:
+      - timed: '0 15 2-30/2 * *'
 
 # -------------------
 # noha-virtual-master
@@ -851,6 +946,14 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger'
     triggers:
       - timed: '0 11 2-30/2 * *'
+- trigger:
+    name: 'compass-os-nosdn-bar-noha-virtual-master-trigger'
+    triggers:
+      - timed: '0 22 1-29/2 * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-virtual-master-trigger'
+    triggers:
+      - timed: '0 10 2-30/2 * *'
 
 # -----------------
 # ha-virtual-euphrates
@@ -907,6 +1010,10 @@
     name: 'compass-os-nosdn-bar-ha-virtual-euphrates-trigger'
     triggers:
       - timed: '0 19 1-29/2 * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-ha-virtual-euphrates-trigger'
+    triggers:
+      - timed: ''  # '0 14 1-29/2 * *'
 
 # -------------------
 # noha-virtual-euphrates
@@ -935,3 +1042,11 @@
     name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger'
     triggers:
       - timed: '0 12 2-30/2 * *'
+- trigger:
+    name: 'compass-os-nosdn-bar-noha-virtual-euphrates-trigger'
+    triggers:
+      - timed: '0 12 1-29/2 * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-virtual-euphrates-trigger'
+    triggers:
+      - timed: ''  # '0 12 2-30/2 * *'