fuel: Adjust build blockers and reconfigure generic-deploy job

Change-Id: I0a190b0e6a4469c356d7762cf4605c4a1ea5ea6a
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index cf42135..45065f8 100644 (file)
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -102,6 +102,7 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'fuel-os-.*?-{pod}-daily-{stream}'
+            block-level: 'NODE'
 
     wrappers:
         - build-name:
@@ -167,6 +168,8 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'fuel-deploy-{pod}-daily-{stream}'
+                - 'fuel-deploy-generic-daily-.*'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:

diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 0ba8e3f..e42aa90 100644 (file)
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -279,28 +279,41 @@
 - job-template:
     name: 'fuel-deploy-generic-daily-{stream}'
 
-    concurrent: false
+    concurrent: true
 
     disabled: false
 
     properties:
         - throttle:
             enabled: true
-            max-total: 1
             max-per-node: 1
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'fuel-os-.*?-ericsson-pod2-daily-{stream}'
+                - 'fuel-os-.*?-daily-.*'
+                - 'fuel-deploy-generic-daily-.*'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'ericsson-pod2-defaults'
         - '{installer}-defaults'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: 'Git URL to use on this Jenkins Slave'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-odl_l2-nofeature-ha'
+        - node:
+            name: SLAVE_NAME
+            description: 'Slave name on Jenkins'
+            allowed-slaves:
+                - ericsson-pod2
+                - opnfv-jump-2
+                - ericsson-pod1
+            default-slaves:
+                - ericsson-pod2
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'