X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffuel%2Ffuel-project-jobs.yml;h=d1855f86ed1fd65afe10b772c4865863e5087562;hb=c2433197d4fba6bea36713878cd38c3c523b4327;hp=b3983986faee4c564049c774a7a463eceb8b3f2f;hpb=02923529b6a032556764d479eba2e54f35ebad4b;p=releng.git

diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index b3983986f..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}'
@@ -123,6 +128,16 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'ci/**'
+                  - compare-type: ANT
+                    pattern: 'build/**'
+                  - compare-type: ANT
+                    pattern: 'deploy/**'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**'
             readable-message: true
 
     builders:
@@ -134,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}'
@@ -175,6 +188,16 @@
                 branches:
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'ci/**'
+                  - compare-type: ANT
+                    pattern: 'build/**'
+                  - compare-type: ANT
+                    pattern: 'deploy/**'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**'
 
     builders:
         - shell:
@@ -187,6 +210,8 @@
 - job-template:
     name: 'fuel-merge-deploy-virtual-{stream}'
 
+    disabled: true
+
     concurrent: true
 
     properties:
@@ -197,7 +222,9 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - 'fuel-deploy-virtual-daily-.*'
+                - 'fuel-os-.*?-virtual-daily-.*'
+                - 'fuel-merge-deploy-virtual-.*'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
@@ -231,6 +258,16 @@
                 branches:
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: 'ci/**'
+                  - compare-type: ANT
+                    pattern: 'build/**'
+                  - compare-type: ANT
+                    pattern: 'deploy/**'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'docs/**'
             dependency-jobs: 'fuel-merge-build-{stream}'
 
     builders:
@@ -248,24 +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-.*?-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}'