Merge "Enable compass Arno scenario for master and stable/brahmaputra"

[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 e939af8..4a8b60d 100644 (file)
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -74,8 +74,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{pod}-defaults'
         - '{installer}-defaults'
+        - '{pod}-defaults'
         - string:
             name: SDN_CONTROLLER
             default: '{sdn-controller}'
@@ -90,9 +90,28 @@
             branch: '{branch}'
 
     builders:
-        - '{installer}-multijob-{pod}-builder':
-            pod: '{pod}'
-            stream: '{stream}'
+        - 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
+        - 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}'
@@ -104,12 +123,15 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 180
+            fail: true
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - '{pod}-defaults'
         - '{installer}-defaults'
+        - '{pod}-defaults'
 
     scm:
         - git-scm:
@@ -118,155 +140,35 @@
             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
-        - multijob:
-            name: yardstick
-            condition: COMPLETED
-            projects:
-                - name: 'yardstick-joid-{pod}-daily-{stream}'
-                  current-parameters: true
-                  kill-phase-on: NEVER
-# intel-pod6 is CI POD so full CI will run on it
-# deploy, functest, yardstick
-- builder:
-    name: joid-multijob-intel-pod6-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
-        - multijob:
-            name: yardstick
-            condition: COMPLETED
-            projects:
-                - name: 'yardstick-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
+    name: 'builder-macro'
     builders:
         - shell: |
             #!/bin/bash
             echo "Running $INSTALLER_TYPE with controller $SDN_CONTROLLER"
             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: intel-pod6-builder
-    builders:
-        - shell: |
-            #!/bin/bash
-            echo "Running $INSTALLER_TYPE with controller $SDN_CONTROLLER"
-            echo
-            echo "Executing clean.sh"
-            cd $WORKSPACE/ci
-            ./clean.sh
-            echo
-            echo "Executing 02-maasdeploy.sh intelpod6"
-            ./02-maasdeploy.sh intelpod6
-            echo
-            echo "Executing deploy.sh -o liberty -s $SDN_CONTROLLER -t ha -l intelpod6"
-            ./deploy.sh -o liberty -s $SDN_CONTROLLER -t ha -l intelpod6
-
-- builder:
-    name: orange-pod2-builder
-    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
+
 ########################
 # trigger macros
 ########################
 - trigger:
     name: 'joid-intel-pod5-odl-trigger'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: '0 2 * * *'
 - trigger:
     name: 'joid-intel-pod6-odl-trigger'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: '0 2 * * *'
 - trigger:
     name: 'joid-orange-pod2-odl-trigger'
     triggers: