X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-verify-jobs.yml;h=f4bdbdd45f590c1da1bad4152f6cee4ce8dfe215;hb=36578233023926d1947d3f6a936286dc77120616;hp=6fd06f70665f77c1c6409a2ee9d82f73f0bc094e;hpb=a54a38f6c3304cf0a4cd01b08d0b8c91bb446e5f;p=releng.git

diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml
index 6fd06f706..f4bdbdd45 100644
--- a/jjb/fuel/fuel-verify-jobs.yml
+++ b/jjb/fuel/fuel-verify-jobs.yml
@@ -15,19 +15,19 @@
         - colorado:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 #####################################
 # patch verification phases
 #####################################
     phase:
         - 'basic':
-            slave-label: 'opnfv-build-ubuntu'
+            slave-label: 'opnfv-build'
         - 'build':
             slave-label: 'opnfv-build-ubuntu'
         - 'deploy-virtual':
-            slave-label: 'fuel-virtual'
+            slave-label: 'opnfv-build'
         - 'smoke-test':
-            slave-label: 'fuel-virtual'
+            slave-label: 'opnfv-build'
 #####################################
 # jobs
 #####################################
@@ -50,14 +50,7 @@
         - throttle:
             enabled: true
             max-total: 4
-            max-per-node: 1
             option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'fuel-verify-master'
-                - 'fuel-verify-colorado'
-            block-level: 'NODE'
 
     scm:
         - gerrit-trigger-scm:
@@ -108,7 +101,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'fuel-virtual-defaults'
+        - 'opnfv-build-defaults'
         - 'fuel-verify-defaults':
             gs-pathname: '{gs-pathname}'
 
@@ -154,7 +147,7 @@
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                  node-parameters: true
+                  node-parameters: false
                   kill-phase-on: FAILURE
                   abort-all-job: true
         - multijob:
@@ -168,7 +161,7 @@
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                  node-parameters: true
+                  node-parameters: false
                   kill-phase-on: FAILURE
                   abort-all-job: true
 
@@ -182,8 +175,7 @@
     properties:
         - throttle:
             enabled: true
-            max-total: 4
-            max-per-node: 1
+            max-total: 6
             option: 'project'
         - build-blocker:
             use-build-blocker: true