X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjoid%2Fjoid.yml;h=fdeddc6804d0168294486e6976367731a49f9def;hb=4c712469bbd6f04ad250a5788b7f6a6dcdb79cee;hp=94e110056890def793299ec3a220c70dbc48ebee;hpb=c69cb53988199632b6fd410ccea42a882712dbf7;p=releng.git

diff --git a/jjb/joid/joid.yml b/jjb/joid/joid.yml
index 94e110056..fdeddc680 100644
--- a/jjb/joid/joid.yml
+++ b/jjb/joid/joid.yml
@@ -9,7 +9,9 @@
 
     controller: 'odl'
 
-    pod: 'intel-pod5'
+    pod:
+        - 'intel-pod5'
+        - 'orange-pod2'
 
     stream:
         - master:
@@ -17,14 +19,14 @@
             gs-pathname: ''
 
     jobs:
-        - 'joid-{controller}-daily-{stream}-{pod}'
-        - 'joid-daily-deploy-{stream}'
+        - 'joid-{controller}-{pod}-daily-{stream}'
+        - 'joid-deploy-{pod}-daily-{stream}'
 
 ########################
 # job templates
 ########################
 - job-template:
-    name: 'joid-{controller}-daily-{stream}-{pod}'
+    name: 'joid-{controller}-{pod}-daily-{stream}'
 
     disabled: false
 
@@ -33,7 +35,7 @@
     parameters:
         - project-parameter:
             project: '{installer}'
-        - 'opnfv-build-defaults'
+        - 'intel-us-build-1-defaults'
         - '{installer}-defaults':
             controller: '{controller}'
 
@@ -45,14 +47,14 @@
 
     builders:
         - trigger-builds:
-          - project: 'joid-daily-deploy-{stream}'
+          - project: 'joid-deploy-{pod}-daily-{stream}'
             git-revision: true
             block: true
             predefined-parameters:
-                CONTROLLER='{controller}'
+                CONTROLLER={controller}
 
 - job-template:
-    name: 'joid-daily-deploy-{stream}'
+    name: 'joid-deploy-{pod}-daily-{stream}'
 
     disabled: false
 
@@ -75,12 +77,41 @@
             refspec: ''
             branch: '{branch}'
 
+    builders:
+        - '{pod}-builder'
+
+########################
+# builder macros
+########################
+- builder:
+    name: intel-pod5-builder
     builders:
         - shell: |
             #!/bin/bash
             echo "Running $INSTALLER_NAME with controller $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
+        - shell: |
+            cd $WORKSPACE/ci
+            echo "Executing 02-maasdeploy.sh intelpod5"
             ./02-maasdeploy.sh intelpod5
+        - shell: |
+            cd $WORKSPACE/ci
+            echo "Executing deploy.sh -o liberty -s $CONTROLLER -t ha -l intelpod5"
             ./deploy.sh -o liberty -s $CONTROLLER -t ha -l intelpod5
+- builder:
+    name: orange-pod2-builder
+    builders:
+        - shell: |
+            #!/bin/bash
+            echo "Running $INSTALLER_NAME with controller $CONTROLLER"
+            echo "Please note that this is WIP generic builder"
+            echo
+            echo "Executing clean.sh"
+            cd $WORKSPACE/ci
+            ./clean.sh
+        - shell:
+            !include-raw ./joid-deploy.sh