Merge "joid: Create jobs for Colorado"

diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index cf4d9cc..08a971a 100644 (file)
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -15,7 +15,14 @@
     master: &master
         stream: master
         branch: '{stream}'
+        disabled: false
         gs-pathname: ''
+    colorado: &colorado
+        stream: colorado
+        branch: 'stable/{stream}'
+        disabled: false
+        gs-pathname: '/{stream}'
+        auto-trigger-name: 'daily-trigger-disabled'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
@@ -28,6 +35,12 @@
         - virtual:
             slave-label: joid-virtual
             <<: *master
+        - baremetal:
+            slave-label: joid-baremetal
+            <<: *colorado
+        - virtual:
+            slave-label: joid-virtual
+            <<: *colorado
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -76,6 +89,8 @@
 - job-template:
     name: 'joid-{scenario}-{pod}-daily-{stream}'
 
+    disabled: '{obj:disabled}'
+
     concurrent: false
 
     properties:
@@ -143,6 +158,8 @@
 - job-template:
     name: 'joid-deploy-{pod}-daily-{stream}'
 
+    disabled: '{obj:disabled}'
+
     concurrent: true
 
     properties:

diff --git a/jjb/joid/joid-verify-jobs.yml b/jjb/joid/joid-verify-jobs.yml
index aa5fc67..9d362d8 100644 (file)
--- a/jjb/joid/joid-verify-jobs.yml
+++ b/jjb/joid/joid-verify-jobs.yml
@@ -15,7 +15,7 @@
         - colorado:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 #####################################
 # patch verification phases
 #####################################
@@ -38,10 +38,10 @@
 - job-template:
     name: 'joid-verify-{stream}'
 
-    project-type: multijob
-
     disabled: '{obj:disabled}'
 
+    project-type: multijob
+
     concurrent: true
 
     properties: