X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjoid%2Fjoid-ci-jobs.yml;h=12a49f31439bbf44d1f879cc1b13eef792f1a1d9;hb=5ddd16d41e6bd92a0849577807b177f52ba1ec20;hp=af81aacb230fa53fb9c1596bc14ff3c67b22b5b7;hpb=b0eef185248b34d2f2c0ff035641c5ae212548cc;p=releng.git

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index af81aacb2..12a49f314 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -23,105 +23,130 @@
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
-#      Current Mapping
-#--------------------------------
-#  everything runs against master branch
+#        brahmaputra
 #--------------------------------
     pod:
         - intel-pod5:
-            <<: *master
-        - orange-pod2:
-            <<: *master
-#--------------------------------
-#     Milestone E Mapping
-#     !!!DO NOT ENABLE!!!
-#--------------------------------
-#        brahmaputra
-#--------------------------------
-#        - intel-pod5:
-#            <<: *brahmaputra
+            <<: *brahmaputra
 #--------------------------------
 #           master
 #--------------------------------
-#        - intel-pod6:
-#            <<: *master
-#        - orange-pod2:
-#            <<: *master
+        - intel-pod6:
+            <<: *master
+        - orange-pod2:
+            <<: *master
+        - juniper-pod1:
+            <<: *master
 #--------------------------------
-
-# please check the triggers before enabling any of the controllers!!!
-    sdn-controller:
-        - 'nosdn':
-            disabled: true
-        - 'odl':
-            disabled: false
-        - '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 Feature: $OPNFV_FEATURE'
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     triggers:
-        - 'joid-{pod}-trigger'
+        - '{auto-trigger-name}'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{pod}-defaults'
         - '{installer}-defaults'
+        - '{pod}-defaults'
         - string:
-            name: SDN_CONTROLLER
-            default: '{sdn-controller}'
-        - string:
-            name: OPNFV_FEATURE
-            default: 'none'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+            name: DEPLOY_SCENARIO
+            default: '{scenario}'
 
     builders:
-        - '{installer}-multijob-{pod}-builder':
-            pod: '{pod}'
-            stream: '{stream}'
+        - 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
 
 - 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 Feature: $OPNFV_FEATURE'
+            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 180
+            fail: true
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{pod}-defaults'
         - '{installer}-defaults'
+        - '{pod}-defaults'
 
     scm:
         - git-scm:
@@ -130,104 +155,40 @@
             branch: '{branch}'
 
     builders:
-        - '{pod}-builder'
+        - 'builder-macro'
 
 ########################
-# multijob builder macros
-########################
-# intel-pod5 is CI POD so full CI will run on it
-# deploy, functest, yardstick
-- builder:
-    name: joid-multijob-intel-pod5-builder
-    builders:
-        - multijob:
-            name: deploy
-            condition: SUCCESSFUL
-            projects:
-                - name: 'joid-deploy-{pod}-daily-{stream}'
-                  current-parameters: true
-                  git-revision: true
-                  kill-phase-on: FAILURE
-        - multijob:
-            name: functest
-            condition: COMPLETED
-            projects:
-                - name: 'functest-joid-{pod}-daily-{stream}'
-                  current-parameters: true
-                  kill-phase-on: NEVER
-# yardstick placeholder
-#        - multijob:
-#            name: yardstick
-#            condition: COMPLETED
-#            projects:
-#                - name: 'yardstick-joid-{pod}-daily-{stream}'
-#                  current-parameters: true
-#                  kill-phase-on: NEVER
-
-# orange-pod2 is NOT a CI POD so only the selected jobs will run
-# deploy and functest currently
-- builder:
-    name: joid-multijob-orange-pod2-builder
-    builders:
-        - multijob:
-            name: deploy
-            condition: SUCCESSFUL
-            projects:
-                - name: 'joid-deploy-{pod}-daily-{stream}'
-                  current-parameters: true
-                  git-revision: true
-                  kill-phase-on: FAILURE
-        - multijob:
-            name: functest
-            condition: COMPLETED
-            projects:
-                - name: 'functest-joid-{pod}-daily-{stream}'
-                  current-parameters: true
-                  kill-phase-on: NEVER
-########################
 # builder macros
 ########################
 - builder:
-    name: intel-pod5-builder
-    builders:
-        - shell: |
-            #!/bin/bash
-            echo "Running $INSTALLER_TYPE with controller $SDN_CONTROLLER"
-            echo "Please note that this is a quick try to see how joid deployment works"
-            echo
-            echo "Executing clean.sh"
-            cd $WORKSPACE/ci
-            ./clean.sh
-            echo
-            echo "Executing 02-maasdeploy.sh intelpod5"
-            ./02-maasdeploy.sh intelpod5
-            echo
-            echo "Executing deploy.sh -o liberty -s $SDN_CONTROLLER -t ha -l intelpod5"
-            ./deploy.sh -o liberty -s $SDN_CONTROLLER -t ha -l intelpod5
-
-- builder:
-    name: orange-pod2-builder
+    name: 'builder-macro'
     builders:
         - shell: |
             #!/bin/bash
             echo "Running $INSTALLER_TYPE with controller $SDN_CONTROLLER"
-            echo "Please note that this is WIP generic builder"
             echo
-            echo "Executing clean.sh"
+            echo "------ First Executing clean.sh ------"
             cd $WORKSPACE/ci
             ./clean.sh
         - shell:
-            !include-raw ./joid-deploy.sh
+            !include-raw: ./joid-deploy.sh
+
 ########################
 # trigger macros
 ########################
 - trigger:
-    name: 'joid-intel-pod5-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-intel-pod5-trigger'
+    triggers:
+        - timed: '0 2 * * *'
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-intel-pod6-trigger'
+    triggers:
+        - timed: '0 2 * * *'
+- trigger:
+    name: 'joid-os-odl_l2-nofeature-ha-orange-pod2-trigger'
     triggers:
-        - timed: '0 3 * * *'
-# timer trigger is commented out since we do not know if the automatic runs should
-# be enabled on orange-pod2
+        - timed: ''
 - trigger:
-    name: 'joid-orange-pod2-trigger'
+    name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger'
     triggers:
-        - timed: '#0 3 * * *'
+        - timed: ''