fuel: Adjust build blockers and reconfigure generic-deploy job

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

diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 95bc3a6..e42aa90 100644 (file)
--- 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,7 +42,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'ericsson-ca-build-1-defaults'
+        - 'ericsson-build-defaults'
         - '{installer}-defaults'
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'
@@ -75,19 +77,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 +122,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 +143,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 +182,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 +204,8 @@
 - job-template:
     name: 'fuel-merge-deploy-virtual-{stream}'
 
+    disabled: true
+
     concurrent: true
 
     properties:
@@ -194,13 +213,20 @@
             enabled: true
             max-total: 2
             max-per-node: 1
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'fuel-os-.*?-virtual-daily-.*'
+                - 'fuel-merge-deploy-virtual-.*'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'fuel-deploy-virtual-defaults'
+        - 'virtual-defaults':
+            installer: '{installer}'
         - '{installer}-defaults'
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'
@@ -214,25 +240,35 @@
         - ssh-agent-credentials:
             users: '{ssh-credentials}'
 
-#    triggers:
-#        - gerrit:
-#            trigger-on:
-#                - change-merged-event
-#                - comment-added-contains-event:
-#                    comment-contains-value: 'remerge'
-#            projects:
-#              - project-compare-type: 'ANT'
-#                project-pattern: '{project}'
-#                branches:
-#                    - branch-compare-type: 'ANT'
-#                      branch-pattern: '**/{branch}'
-#            dependency-jobs: 'fuel-merge-build-{stream}'
+    triggers:
+        - gerrit:
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'remerge'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                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:
         - shell:
             !include-raw-escape: ./fuel-download-artifact.sh
         - shell:
-            !include-raw-escape: ./fuel-deploy-virtual.sh
+            !include-raw-escape: ./fuel-deploy.sh
         - shell:
             !include-raw-escape: ./fuel-workspace-cleanup.sh
 
@@ -243,21 +279,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}'
 
@@ -269,7 +325,7 @@
 
     wrappers:
         - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+            name: '$BUILD_NUMBER - POD: $NODE_NAME Scenario: $DEPLOY_SCENARIO'
 
     builders:
         - shell: