joid: Disable os-onos-nofeature-ha trigger on pod5

[releng.git] / jjb / joid / joid-ci-jobs.yml

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 2617904..971addc 100644 (file)
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -53,7 +53,7 @@
         - 'os-odl_l2-nofeature-noha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-onos-nofeature-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'joid-{scenario}-{pod}-trigger'
         - 'os-onos-nofeature-noha':
             auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
         - 'os-ocl-nofeature-ha':
@@ -71,10 +71,6 @@
 - job-template:
     name: 'joid-{scenario}-{pod}-daily-{stream}'
 
-    project-type: multijob
-
-    node: intel-build
-
     concurrent: false
 
     properties:
@@ -98,30 +94,42 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults'
+        - '{pod}-defaults':
+            installer: '{installer}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: '{scenario}'
 
     builders:
-        - multijob:
-            name: deploy
-            condition: SUCCESSFUL
-            projects:
-                - name: 'joid-deploy-{pod}-daily-{stream}'
-                  current-parameters: true
-                  kill-phase-on: FAILURE
-        - multijob:
-            name: functest
-            condition: COMPLETED
-            projects:
-                - name: 'functest-joid-{pod}-daily-{stream}'
-                  current-parameters: true
-                  kill-phase-on: NEVER
-        - multijob:
-            name: yardstick
-            condition: COMPLETED
-            projects:
-                - name: 'yardstick-joid-{pod}-daily-{stream}'
-                  current-parameters: true
-                  kill-phase-on: NEVER
+        - trigger-builds:
+            - project: 'joid-deploy-{pod}-daily-{stream}'
+              current-parameters: true
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              same-node: true
+              block: true
+        - trigger-builds:
+            - project: 'functest-joid-{pod}-daily-{stream}'
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO={scenario}
+              same-node: true
+              block: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+            - project: 'yardstick-joid-{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'
 
 - job-template:
     name: 'joid-deploy-{pod}-daily-{stream}'
@@ -151,6 +159,9 @@
         - '{installer}-defaults'
         - '{pod}-defaults':
             installer: '{installer}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
 
     scm:
         - git-scm:
@@ -199,3 +210,23 @@
     name: 'joid-os-odl_l2-nofeature-ha-virtual-trigger'
     triggers:
         - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-intel-pod5-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-intel-pod6-trigger'
+    triggers:
+        - timed: '0 14 * * *'
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-orange-pod2-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-juniper-pod1-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-onos-nofeature-ha-virtual-trigger'
+    triggers:
+        - timed: ''