Merge "Modify yardstick requirements.txt path config in releng"

[releng.git] / jjb / fastpathmetrics / fastpathmetrics.yml

diff --git a/jjb/fastpathmetrics/fastpathmetrics.yml b/jjb/fastpathmetrics/fastpathmetrics.yml
index e8aca18..40df385 100644 (file)
--- a/jjb/fastpathmetrics/fastpathmetrics.yml
+++ b/jjb/fastpathmetrics/fastpathmetrics.yml
@@ -16,19 +16,23 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
-        - brahmaputra:
+            disabled: false
+        - colorado:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
+            disabled: false
 
 - job-template:
     name: 'fastpathmetrics-verify-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'opnfv-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -70,6 +74,8 @@
 
     project-type: freestyle
 
+    disabled: '{obj:disabled}'
+
     concurrent: true
 
     properties:
@@ -77,13 +83,14 @@
             enabled: true
             max-total: 3
             max-per-node: 2
+            option: 'project'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'opnfv-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -119,6 +126,8 @@
 
     project-type: freestyle
 
+    disabled: '{obj:disabled}'
+
     concurrent: true
 
     properties:
@@ -126,13 +135,14 @@
             enabled: true
             max-total: 3
             max-per-node: 2
+            option: 'project'
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'opnfv-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -141,8 +151,7 @@
             choosing-strategy: 'default'
 
     triggers:
-         - pollscm:
-             cron: '@midnight'
+         - timed: '@midnight'
 
     builders:
         - shell: |