X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjoid%2Fjoid-ci-jobs.yml;h=dfd608442f852b4d39175fd80586e63a9934c095;hb=e9ec000b04d76df5839292410a583002b9ebabe9;hp=4a8b60db56ca40993abbdad23600ffc364d400af;hpb=b221b8cfe13a0f484d92c9a5721294bca0df669d;p=releng.git

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 4a8b60db5..dfd608442 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -28,6 +28,8 @@
     pod:
         - intel-pod5:
             <<: *brahmaputra
+        - virtual:
+            <<: *brahmaputra
 #--------------------------------
 #           master
 #--------------------------------
@@ -35,59 +37,70 @@
             <<: *master
         - orange-pod2:
             <<: *master
+        - juniper-pod1:
+            <<: *master
+        - virtual:
+            <<: *master
 #--------------------------------
-# please check the triggers before enabling any of the controllers!!!
-    sdn-controller:
-        - 'odl':
-            disabled: false
-# commented out below controllers to get Arno scenario settled first
-#        - 'nosdn':
-#            disabled: true
-#        - 'onos':
-#            disabled: true
-#        - 'opencontrail':
-#            disabled: true
+# new scenario descriptions
+    scenario:
+        - 'os-nosdn-nofeature-noha':
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+        - 'os-nosdn-nofeature-ha':
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+        - 'os-odl_l2-nofeature-ha':
+            auto-trigger-name: 'joid-{scenario}-{pod}-trigger'
+        - 'os-odl_l2-nofeature-noha':
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+        - 'os-onos-nofeature-ha':
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+        - 'os-onos-nofeature-noha':
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+        - 'os-ocl-nofeature-ha':
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+        - 'os-ocl-nofeature-noha':
+            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
 
     jobs:
-        - 'joid-{sdn-controller}-{pod}-daily-{stream}'
+#        - 'joid-{scenario}-{pod}-daily-{stream}'
         - 'joid-deploy-{pod}-daily-{stream}'
 
 ########################
 # job templates
 ########################
 - job-template:
-    name: 'joid-{sdn-controller}-{pod}-daily-{stream}'
+    name: 'joid-{scenario}-{pod}-daily-{stream}'
 
     project-type: multijob
 
-    disabled: '{obj:disabled}'
-
     concurrent: false
 
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'joid-os-.*?-{pod}-daily-{stream}'
+
     wrappers:
         - build-name:
-            name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO'
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     triggers:
-        - 'joid-{pod}-{sdn-controller}-trigger'
+        - '{auto-trigger-name}'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults'
-        - string:
-            name: SDN_CONTROLLER
-            default: '{sdn-controller}'
+        - '{pod}-defaults':
+            installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
-            default: 'none'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+            default: '{scenario}'
 
     builders:
         - multijob:
@@ -96,7 +109,6 @@
             projects:
                 - name: 'joid-deploy-{pod}-daily-{stream}'
                   current-parameters: true
-                  git-revision: true
                   kill-phase-on: FAILURE
         - multijob:
             name: functest
@@ -116,13 +128,21 @@
 - job-template:
     name: 'joid-deploy-{pod}-daily-{stream}'
 
-    disabled: false
-
     concurrent: false
 
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 1
+            max-per-node: 1
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'joid-deploy-{pod}-daily-{stream}'
+
     wrappers:
         - build-name:
-            name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO'
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
         - timeout:
             timeout: 180
             fail: true
@@ -131,7 +151,11 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults'
+        - '{pod}-defaults':
+            installer: '{installer}'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-odl_l2-nofeature-ha'
 
     scm:
         - git-scm:
@@ -141,7 +165,6 @@
 
     builders:
         - 'builder-macro'
-
 ########################
 # builder macros
 ########################
@@ -156,20 +179,28 @@
             cd $WORKSPACE/ci
             ./clean.sh
         - shell:
-            !include-raw ./joid-deploy.sh
+            !include-raw: ./joid-deploy.sh
 
 ########################
 # trigger macros
 ########################
 - trigger:
-    name: 'joid-intel-pod5-odl-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-intel-pod5-trigger'
     triggers:
         - timed: '0 2 * * *'
 - trigger:
-    name: 'joid-intel-pod6-odl-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-intel-pod6-trigger'
     triggers:
         - timed: '0 2 * * *'
 - trigger:
-    name: 'joid-orange-pod2-odl-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-virtual-trigger'
     triggers:
         - timed: ''