Bugfix2 for fuel multijob example

[releng.git] / jjb / fuel / opnfv-fuel.yml

diff --git a/jjb/fuel/opnfv-fuel.yml b/jjb/fuel/opnfv-fuel.yml
index 92bd96b..a0fbce2 100644 (file)
--- a/jjb/fuel/opnfv-fuel.yml
+++ b/jjb/fuel/opnfv-fuel.yml
@@ -8,11 +8,23 @@
     installer: 'fuel'
 
     controller:
-        - 'opencontrail'
-        - 'opendaylight'
+        - 'odl'
         - 'onos'
+        - 'opencontrail'
+
+    pod:
+        - 'opnfv-jump-2'
+        - 'ericsson-pod1'
 
-    pod: 'lf-pod2'
+    loop:
+        - 'daily'
+
+    # ignore these as these will not exist in real job
+    dummy-phase:
+        - build
+        - deploy
+        - functest
+        - yardstick
 
     stream:
         - master:
@@ -20,26 +32,28 @@
             gs-pathname: ''
 
     jobs:
-        - 'opnfv-fuel-{controller}-daily-{stream}'
-        - 'opnfv-fuel-daily-deploy-{stream}'
+        - 'tmp_fuel-{controller}-{pod}-{loop}-{stream}'
+        - 'tmp_fuel-{dummy-phase}-{pod}-{loop}-{stream}'
 
 ########################
 # job templates
 ########################
 - job-template:
-    name: 'opnfv-fuel-{controller}-daily-{stream}'
+    name: 'tmp_fuel-{controller}-{pod}-{loop}-{stream}'
 
-    disabled: true
-
-    concurrent: false
-
-    node: ericsson-build
+    project-type: multijob
 
     parameters:
         - project-parameter:
             project: '{installer}'
-        - '{installer}-defaults':
-            controller: '{controller}'
+        - 'ericsson-ca-build-1-defaults'
+        - '{installer}-defaults'
+        - string:
+            name: CONTROLLER
+            default: '{controller}'
+        - string:
+            name: FEATURE
+            default: 'none'
 
     scm:
         - git-scm:
@@ -48,17 +62,36 @@
             branch: '{branch}'
 
     builders:
-        - trigger-builds:
-          - project: 'opnfv-fuel-daily-deploy-{stream}'
-            git-revision: true
-            block: true
-            predefined-parameters:
-                CONTROLLER='{controller}'
+        - multijob:
+            name: build
+            condition: SUCCESSFUL
+            projects:
+                - name: 'tmp_fuel-build-{loop}-{stream}'
+                  kill-phase-on: FAILURE
+                  current-parameters: true
+        - multijob:
+            name: deploy
+            condition: SUCCESSFUL
+            projects:
+                - name: 'tmp_fuel-deploy-{pod}-{loop}-{stream}'
+                  kill-phase-on: FAILURE
+                  current-parameters: true
+        - multijob:
+            name: functest
+            projects:
+                - name: 'tmp_fuel-test-{pod}-{loop}-{stream}'
+                  current-parameters: true
+        - multijob:
+            name: yardstick
+            projects:
+                - name: 'tmp_fuel-test-{pod}-{loop}-{stream}'
+                  current-parameters: true
+
 
 - job-template:
-    name: 'opnfv-fuel-daily-deploy-{stream}'
+    name: 'tmp_fuel-{dummy-phase}-{pod}-{loop}-{stream}'
 
-    disabled: true
+    disabled: false
 
     concurrent: false
 
@@ -71,6 +104,12 @@
             project: '{installer}'
         - '{pod}-defaults'
         - '{installer}-defaults'
+        - string:
+            name: CONTROLLER
+            default: 'none'
+        - string:
+            name: FEATURE
+            default: 'none'
 
     scm:
         - git-scm: