Fuel: Switch to new scenario/pod descriptions and enable 7 scenarios

[releng.git] / jjb / fuel / fuel-ci-jobs.yml

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 452d037..3a6213c 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -38,21 +38,13 @@
     sdn-controller:
         - 'nosdn':
             disabled: false
-# commented out below controllers to get nosdn scenario settled first
-#        - 'odl':
-#            disabled: true
-#        - 'onos':
-#            disabled: true
-#        - 'opencontrail':
-#            disabled: true
 
     jobs:
         - 'fuel-{sdn-controller}-{pod}-daily-{stream}'
         - 'fuel-deploy-{pod}-daily-{stream}'
-        - 'fuel-deploy-{pod}-daily-{stream}-wip'
 
 ########################
-# job templates
+# job templates - old type of defining the scenario
 ########################
 - job-template:
     name: 'fuel-{sdn-controller}-{pod}-daily-{stream}'
@@ -145,54 +137,12 @@
             refspec: ''
             branch: '{branch}'
 
-    wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - SDN: $SDN_CONTROLLER Scenario: $DEPLOY_SCENARIO'
-
-    builders:
-        - shell:
-            !include-raw-escape: ./fuel-download-artifact.sh
-        - shell:
-            !include-raw-escape: ./fuel-deploy.sh
-
-    publishers:
-        - email:
-            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
-
-- job-template:
-    name: 'fuel-deploy-{pod}-daily-{stream}-wip'
-
-    concurrent: false
-
-    properties:
-        - throttle:
-            enabled: true
-            max-total: 1
-            max-per-node: 1
-
-    parameters:
-        - project-parameter:
-            project: 'fuel'
-        - 'ericsson-pod2-defaults'
-        - 'fuel-defaults'
-        - fuel-ci-parameter:
-            gs-pathname: ''
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: 'master'
-
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     builders:
-        - shell:
-            !include-raw-escape: ./fuel-download-artifact.sh
-        - shell:
-            !include-raw-escape: ./fuel-deploy-new.sh
+        - 'builder-{stream}'
 
     publishers:
         - email:
@@ -216,6 +166,23 @@
             default: artifacts.opnfv.org/$PROJECT{gs-pathname}
             description: "URL to Google Storage."
 ########################
+# builder macros
+########################
+- builder:
+    name: 'builder-master'
+    builders:
+        - shell:
+            !include-raw-escape: ./fuel-download-artifact.sh
+        - shell:
+            !include-raw-escape: ./fuel-deploy-master.sh
+- builder:
+    name: 'builder-brahmaputra'
+    builders:
+        - shell:
+            !include-raw-escape: ./fuel-download-artifact.sh
+        - shell:
+            !include-raw-escape: ./fuel-deploy.sh
+########################
 # trigger macros
 ########################
 # trigger for opnfv-jump-2 is set to run 1 hour ahead of others