X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=500984adafa16860a604c84794d62e659bedba42;hb=d1a117e87cfdccd2e45ea2e286191081b37c04af;hp=76c757497fa26c0cb30c9028e0e796e168fd61fc;hpb=f61173ebe98f1c746f7cb7eef439d56590a4b78e;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 76c757497..500984ada 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -60,6 +60,15 @@
         - 'os-ocl-nofeature-ha':
             disabled: false
             auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-onos-sfc-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-odl_l2-moon-noha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+        - 'os-nosdn-kvm-ha':
+            disabled: false
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
         - 'compass-{scenario}-{pod}-daily-{stream}'
@@ -77,6 +86,7 @@
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -104,9 +114,11 @@
         - '{auto-trigger-name}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - trigger-builds:
             - project: 'compass-deploy-{pod}-daily-{stream}'
-              current-parameters: false
+              current-parameters: true
               predefined-parameters: |
                 DEPLOY_SCENARIO={scenario}
                 COMPASS_OS_VERSION={os-version}
@@ -146,6 +158,7 @@
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -181,6 +194,8 @@
 
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - shell:
             !include-raw-escape: ./compass-download-artifact.sh
         - shell:
@@ -209,8 +224,13 @@
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
-                - 'liberty'
                 - 'mitaka'
+                - 'liberty'
+        - choice:
+            name: COMPASS_OS_VERSION_OPTION
+            choices:
+                - ''
+                - 'xenial'
 
 ########################
 # trigger macros
@@ -222,17 +242,29 @@
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: '0 23 * * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 19 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger'
+    triggers:
+        - timed: '0 11 * * *'
+- trigger:
+    name: 'compass-os-onos-sfc-ha-huawei-pod2-master-trigger'
+    triggers:
+        - timed: '0 7 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-moon-noha-huawei-pod2-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-kvm-ha-huawei-pod2-master-trigger'
     triggers:
         - timed: ''
 
@@ -243,11 +275,11 @@
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: '0 23 * * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 19 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger'
     triggers:
@@ -255,7 +287,19 @@
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: '0 11 * * *'
+- trigger:
+    name: 'compass-os-onos-sfc-ha-baremetal-master-trigger'
+    triggers:
+        - timed: '0 7 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-moon-noha-baremetal-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
+    triggers:
+        - timed: ''
 
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger'
@@ -277,6 +321,18 @@
     name: 'compass-os-ocl-nofeature-ha-baremetal-brahmaputra-trigger'
     triggers:
         - timed: ''
+- trigger:
+    name: 'compass-os-onos-sfc-ha-baremetal-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-moon-noha-baremetal-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-kvm-ha-baremetal-brahmaputra-trigger'
+    triggers:
+        - timed: ''
 
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger'
@@ -285,11 +341,11 @@
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: '0 23 * * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+        - timed: '0 19 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-virtual-master-trigger'
     triggers:
@@ -297,7 +353,20 @@
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: '0 11 * * *'
+- trigger:
+    name: 'compass-os-onos-sfc-ha-virtual-master-trigger'
+    triggers:
+        - timed: '0 7 * * *'
+- trigger:
+    name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
+    triggers:
+        - timed: ''
+
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
@@ -318,3 +387,15 @@
     name: 'compass-os-ocl-nofeature-ha-virtual-brahmaputra-trigger'
     triggers:
         - timed: ''
+- trigger:
+    name: 'compass-os-onos-sfc-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-moon-noha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-nosdn-kvm-ha-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''