X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=8eeaabfaa7ad76a06ecba3a46f34bb2beadde3da;hb=523d67bd309294cf3bf9f6ad1c68481c7ef2ae4c;hp=7ce9e3a60b602bd16655bf45533abe5682f1bfa2;hpb=6486bfbd8c74ac8aab3a586d8aa9a2e259690851;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 7ce9e3a60..8eeaabfaa 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -14,13 +14,13 @@
       ppa-pathname: '/{stream}'
       disabled: false
       openstack-version: pike
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
       ppa-pathname: '/{stream}'
-      openstack-version: ocata
+      openstack-version: pike
     danube: &danube
       stream: danube
       branch: 'stable/{stream}'
@@ -45,11 +45,11 @@
       - baremetal:
           slave-label: compass-baremetal-branch
           os-version: 'xenial'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual-branch
           os-version: 'xenial'
-          <<: *euphrates
+          <<: *fraser
       # -------------------------------
       #        master
       # -------------------------------
@@ -69,9 +69,6 @@
       - 'os-nosdn-nofeature-ha':
           disabled: false
           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-      - 'os-odl_l2-nofeature-ha':
-          disabled: false
-          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
       - 'os-odl_l3-nofeature-ha':
           disabled: false
           auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
@@ -123,6 +120,9 @@
       - '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'
@@ -162,8 +162,6 @@
           block-level: 'NODE'
 
     wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
       - fix-workspace-permissions
 
     parameters:
@@ -174,7 +172,6 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
-          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
@@ -276,6 +273,26 @@
               label: '{scenario}'
           steps:
             - trigger-builds:
+                - 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'
                 - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}'
                   current-parameters: false
                   predefined-parameters:
@@ -342,7 +359,6 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
-          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
@@ -363,7 +379,7 @@
                 !include-raw-escape: ./compass-deploy.sh
       - conditional-step:
           condition-kind: regex-match
-          regex: (danube|euphrates)
+          regex: (danube|fraser)
           label: '{stream}'
           steps:
             - shell:
@@ -389,10 +405,10 @@
           installer: '{installer}'
           gs-pathname: '{gs-pathname}'
           ppa-pathname: '{ppa-pathname}'
-          scenario: '{scenario}'
       - '{slave-label}-defaults'
       - '{installer}-defaults'
 
+
     scm:
       - git-scm
 
@@ -437,7 +453,7 @@
           description: "Directory where the logs will be located upon the completion of the collection."
       - string:
           name: DEPLOY_SCENARIO
-          default: '{scenario}'
+          default: 'os-nosdn-nofeature-ha'
           description: "Scenario to deploy with."
       - string:
           name: COMPASS_OS_VERSION
@@ -462,10 +478,6 @@
     name: 'compass-os-nosdn-openo-ha-baremetal-centos-master-trigger'
     triggers:
       - timed: ''
-- trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-baremetal-centos-master-trigger'
-    triggers:
-      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
@@ -538,6 +550,10 @@
     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:
@@ -555,10 +571,6 @@
     name: 'compass-os-nosdn-openo-ha-huawei-pod7-danube-trigger'
     triggers:
       - timed: ''
-- trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod7-danube-trigger'
-    triggers:
-      - timed: ''  # '0 21 * * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-huawei-pod7-danube-trigger'
     triggers:
@@ -631,6 +643,10 @@
     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:
@@ -647,10 +663,6 @@
     name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger'
     triggers:
       - timed: ''
-- trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
-    triggers:
-      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
     triggers:
@@ -670,7 +682,7 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger'
     triggers:
-      - timed: '0 12 2-30/2 * *'
+      - timed: ''  # '0 12 2-30/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
     triggers:
@@ -723,100 +735,104 @@
     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
+# ha-baremetal-fraser
 # -------------------
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 1 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-openo-ha-baremetal-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-openo-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 21 2-30/2 * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-onos-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-ocl-nofeature-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-onos-sfc-ha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl_l2-moon-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: '0 5 1-29/2 * *'
+      - timed: ''  # '0 5 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-kvm-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 13 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 9 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-nofeature-ha-baremetal-euphrates-trigger'
+    name: 'compass-k8-nosdn-nofeature-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 5 1-29/2 * *'
 - trigger:
-    name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl-sfc-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 17 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-bar-ha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-bar-ha-baremetal-fraser-trigger'
     triggers:
       - timed: '0 21 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-euphrates-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-ha-baremetal-fraser-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 7 2-30/2 * *'
 
 # ---------------------
-# noha-baremetal-euphrates
+# noha-baremetal-fraser
 # ---------------------
 - trigger:
-    name: 'compass-os-nosdn-kvm-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-kvm-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-nofeature-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-nofeature-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl_l3-nofeature-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl_l2-moon-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl-sfc-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-odl-sfc-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-euphrates-trigger'
+    name: 'compass-os-nosdn-bar-noha-baremetal-fraser-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-fraser-trigger'
     triggers:
       - timed: ''
 
@@ -831,10 +847,6 @@
     name: 'compass-os-nosdn-openo-ha-virtual-master-trigger'
     triggers:
       - timed: ''
-- trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
-    triggers:
-      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
     triggers:
@@ -854,7 +866,7 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger'
     triggers:
-      - timed: '30 12 1-29/2 * *'
+      - timed: ''  # '30 12 1-29/2 * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
     triggers:
@@ -898,7 +910,7 @@
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
     triggers:
-      - timed: '0 18 2-30/2 * *'
+      - timed: ''  # '0 18 2-30/2 * *'
 - trigger:
     name: 'compass-os-odl-sfc-noha-virtual-master-trigger'
     triggers:
@@ -907,99 +919,103 @@
     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
+# ha-virtual-fraser
 # -----------------
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 23 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-openo-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-openo-ha-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-virtual-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 22 2-30/2 * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-os-onos-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-os-ocl-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-onos-sfc-ha-virtual-euphrates-trigger'
+    name: 'compass-os-onos-sfc-ha-virtual-fraser-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-virtual-euphrates-trigger'
+    name: 'compass-os-odl_l2-moon-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 20 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-kvm-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 16 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 14 1-29/2 * *'
 - trigger:
-    name: 'compass-os-odl-sfc-ha-virtual-euphrates-trigger'
+    name: 'compass-os-odl-sfc-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 18 2-30/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger'
+    name: 'compass-k8-nosdn-nofeature-ha-virtual-fraser-trigger'
     triggers:
       - timed: '5 1 2-30/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-bar-ha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-bar-ha-virtual-fraser-trigger'
     triggers:
       - timed: '0 19 1-29/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-ha-virtual-euphrates-trigger'
+    name: 'compass-k8-nosdn-stor4nfv-ha-virtual-fraser-trigger'
     triggers:
-      - timed: ''  # '0 14 1-29/2 * *'
+      - timed: '0 15 1-29/2 * *'
 
 # -------------------
-# noha-virtual-euphrates
+# noha-virtual-fraser
 # -------------------
 - trigger:
-    name: 'compass-os-nosdn-kvm-noha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-kvm-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 15 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-nofeature-noha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-nofeature-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 17 2-30/2 * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-noha-virtual-euphrates-trigger'
+    name: 'compass-os-odl_l3-nofeature-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 23 1-29/2 * *'
 - trigger:
-    name: 'compass-os-odl_l2-moon-noha-virtual-euphrates-trigger'
+    name: 'compass-os-odl_l2-moon-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 21 2-30/2 * *'
 - trigger:
-    name: 'compass-os-odl-sfc-noha-virtual-euphrates-trigger'
+    name: 'compass-os-odl-sfc-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 19 1-29/2 * *'
 - trigger:
-    name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-fraser-trigger'
     triggers:
       - timed: '0 12 2-30/2 * *'
 - trigger:
-    name: 'compass-k8-nosdn-stor4nfv-noha-virtual-euphrates-trigger'
+    name: 'compass-os-nosdn-bar-noha-virtual-fraser-trigger'
     triggers:
-      - timed: ''  # '0 12 2-30/2 * *'
+      - timed: '0 12 1-29/2 * *'
+- trigger:
+    name: 'compass-k8-nosdn-stor4nfv-noha-virtual-fraser-trigger'
+    triggers:
+      - timed: '0 13 2-30/2 * *'