1 files changed, 36 insertions, 20 deletions

diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 2e30fb1e6..d1855f86e 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -12,9 +12,11 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
+            disabled: false
         - brahmaputra:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
+            disabled: false
 
     jobs:
         - 'fuel-build-daily-{stream}'
@@ -40,8 +42,14 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'ericsson-ca-build-1-defaults'
+        - 'ericsson-build-defaults'
         - '{installer}-defaults'
+        - choice:
+            name: FORCE_BUILD
+            choices:
+              - 'false'
+              - 'true'
+            description: "Force build even if there is no changes in fuel repo. Default false"
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'
 
@@ -75,19 +83,16 @@
 - job-template:
     name: 'fuel-verify-build-{stream}'
 
-    concurrent: true
+    disabled: '{obj:disabled}'
 
-    properties:
-        - throttle:
-            enabled: true
-            max-total: 3
+    concurrent: true
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-ca-build-1-defaults'
+        - 'ericsson-build-defaults'
         - '{installer}-defaults'
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'
@@ -144,22 +149,20 @@
 - job-template:
     name: 'fuel-merge-build-{stream}'
 
-    concurrent: true
+    disabled: '{obj:disabled}'
 
-    properties:
-        - throttle:
-            enabled: true
-            max-total: 2
+    concurrent: true
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'ericsson-ca-build-1-defaults'
+        - 'ericsson-build-defaults'
         - '{installer}-defaults'
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'
+
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -207,9 +210,9 @@
 - job-template:
     name: 'fuel-merge-deploy-virtual-{stream}'
 
-    concurrent: true
+    disabled: true
 
-    disabled: false
+    concurrent: true
 
     properties:
         - throttle:
@@ -282,28 +285,41 @@
 - job-template:
     name: 'fuel-deploy-generic-daily-{stream}'
 
-    concurrent: false
+    concurrent: true
 
-    disabled: 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}'