summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2016-08-23 14:00:32 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-23 14:00:32 +0000
commit8e02da5b7acbf7d14f96462bb58776e48edc26e0 (patch)
treeb85929993c7e42726fd9d135e721ee476fe8eac4
parent606535c27514ed53e0dedb9c88cdb46f91fbcc08 (diff)
parent21156e0c01a01a1ff707386d640cff32990501c0 (diff)
Merge "joid: Create jobs for Colorado"
-rw-r--r--jjb/joid/joid-ci-jobs.yml17
-rw-r--r--jjb/joid/joid-verify-jobs.yml6
2 files changed, 20 insertions, 3 deletions
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index cf4d9cc1c..08a971a5a 100644
--- 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 aa5fc672d..9d362d800 100644
--- 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: