Merge "doctor: skip voting from results of immature jobs"

[releng.git] / jjb / opnfv / opnfv-docker.yml

diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml
index 6b49242..4250eef 100644 (file)
--- a/jjb/opnfv/opnfv-docker.yml
+++ b/jjb/opnfv/opnfv-docker.yml
@@ -20,8 +20,10 @@
     stream:
         - master:
             branch: '{stream}'
-        - brahmaputra:
+            disabled: false
+        - colorado:
             branch: 'stable/{stream}'
+            disabled: false
 
 ########################
 # job templates
@@ -29,19 +31,19 @@
 - job-template:
     name: '{project}-docker-build-push-{stream}'
 
-    disabled: false
+    disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - string:
             name: PUSH_IMAGE
             default: "true"
             description: "To enable/disable pushing the image to Dockerhub."
         - string:
             name: BASE_VERSION
-            default: "brahmaputra.3"
+            default: "colorado.0"
             description: "Base version to be used."
         - string:
             name: DOCKER_REPO_NAME
@@ -72,19 +74,19 @@
 - job-template:
     name: 'yardstick-docker-build-push-{stream}'
 
-    disabled: false
+    disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: 'yardstick'
-        - 'ericsson-build-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - string:
             name: PUSH_IMAGE
             default: "true"
             description: "To enable/disable pushing the image to Dockerhub."
         - string:
             name: BASE_VERSION
-            default: "brahmaputra.3"
+            default: "colorado.0"
             description: "Base version to be used."
         - string:
             name: DOCKER_REPO_NAME