From c62126eaf3f93e11653a5d37cad984797bd4d3bf Mon Sep 17 00:00:00 2001
From: David Blaisonneau <david.blaisonneau@orange.com>
Date: Fri, 8 Jan 2016 15:07:50 +0100
Subject: Merge joid-multijob builders

Change-Id: Ie28f68b2fcea24052c9cf9168963063f5e147039
Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
---
 jjb/joid/joid-ci-jobs.yml | 112 ++++++++++------------------------------------
 1 file changed, 23 insertions(+), 89 deletions(-)

(limited to 'jjb')

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index c9017b88c..4a8b60db5 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -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}'
@@ -124,92 +143,6 @@
         - '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:
@@ -224,6 +157,7 @@
             ./clean.sh
         - shell:
             !include-raw ./joid-deploy.sh
+
 ########################
 # trigger macros
 ########################
-- 
cgit 1.2.3-korg