summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-07-22 10:09:49 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-08-23 14:17:31 +0200
commit2d159fc0fc7c2b0cd4c911e30f83a4713ee0a2dc (patch)
treec7ef5c7092d5852dcaaf93bc6ca9d2e80b3ee68c
parent6ec6449d0b80cd3a6256377043a4276e63fc5581 (diff)
fuel: Create jobs for Colorado
This change contains updates that impact compass and joid jobs due to updates in functest and yardstick that remove brahmaputra branch. Please note that the triggers for colorado haven't been created yet. It will be done once the basics in place. Change-Id: Id5eb8c406d34ff9f3ac59f73243034cbf49b23f0 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml17
-rw-r--r--jjb/fuel/fuel-project-jobs.yml6
-rw-r--r--jjb/fuel/fuel-verify-jobs.yml2
-rw-r--r--jjb/functest/functest-ci-jobs.yml18
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml20
5 files changed, 41 insertions, 22 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 70942dd25..3615add83 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -13,7 +13,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
#--------------------------------
@@ -26,6 +33,12 @@
- virtual:
slave-label: fuel-virtual
<<: *master
+ - baremetal:
+ slave-label: fuel-baremetal
+ <<: *colorado
+ - virtual:
+ slave-label: fuel-virtual
+ <<: *colorado
#--------------------------------
# None-CI PODs
#--------------------------------
@@ -93,6 +106,8 @@
- job-template:
name: 'fuel-{scenario}-{pod}-daily-{stream}'
+ disabled: '{obj:disabled}'
+
concurrent: false
properties:
@@ -166,6 +181,8 @@
- job-template:
name: 'fuel-deploy-{pod}-daily-{stream}'
+ disabled: '{obj:disabled}'
+
concurrent: true
properties:
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index c160fb893..cf893832b 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -13,7 +13,7 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - brahmaputra:
+ - colorado:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
@@ -30,6 +30,8 @@
- job-template:
name: 'fuel-build-daily-{stream}'
+ disabled: '{obj:disabled}'
+
concurrent: false
properties:
@@ -223,7 +225,7 @@
concurrent: true
- disabled: false
+ disabled: '{obj:disabled}'
properties:
- throttle:
diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml
index 2b6239422..2662cb7c0 100644
--- a/jjb/fuel/fuel-verify-jobs.yml
+++ b/jjb/fuel/fuel-verify-jobs.yml
@@ -15,7 +15,7 @@
- colorado:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- disabled: true
+ disabled: false
#####################################
# patch verification phases
#####################################
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 7afd7d1c6..87a45f1e5 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -14,8 +14,8 @@
branch: '{stream}'
gs-pathname: ''
docker-tag: 'latest'
- brahmaputra: &brahmaputra
- stream: brahmaputra
+ colorado: &colorado
+ stream: colorado
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
docker-tag: 'stable'
@@ -40,11 +40,11 @@
- baremetal:
slave-label: fuel-baremetal
installer: fuel
- <<: *brahmaputra
+ <<: *colorado
- virtual:
slave-label: fuel-virtual
installer: fuel
- <<: *brahmaputra
+ <<: *colorado
# joid CI PODs
- baremetal:
slave-label: joid-baremetal
@@ -57,11 +57,11 @@
- baremetal:
slave-label: joid-baremetal
installer: joid
- <<: *brahmaputra
+ <<: *colorado
- virtual:
slave-label: joid-virtual
installer: joid
- <<: *brahmaputra
+ <<: *colorado
# compass CI PODs
- baremetal:
slave-label: compass-baremetal
@@ -74,11 +74,11 @@
- baremetal:
slave-label: compass-baremetal
installer: compass
- <<: *brahmaputra
+ <<: *colorado
- virtual:
slave-label: compass-virtual
installer: compass
- <<: *brahmaputra
+ <<: *colorado
# apex CI PODs
- apex-verify-master:
slave-label: '{pod}'
@@ -130,7 +130,7 @@
- arm-pod1:
slave-label: '{pod}'
installer: fuel
- <<: *brahmaputra
+ <<: *colorado
#--------------------------------
testsuite:
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index a77b5c66d..eacb790a2 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -14,11 +14,11 @@
branch: '{stream}'
gs-pathname: ''
docker-tag: 'latest'
- brahmaputra: &brahmaputra
- stream: brahmaputra
+ colorado: &colorado
+ stream: colorado
branch: 'stable/{stream}'
gs-pathname: '{stream}'
- docker-tag: 'brahmaputra.1.0'
+ docker-tag: 'colorado.1.0'
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
@@ -43,12 +43,12 @@
slave-label: fuel-baremetal
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *brahmaputra
+ <<: *colorado
- virtual:
slave-label: fuel-virtual
installer: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *brahmaputra
+ <<: *colorado
# joid CI PODs
- baremetal:
slave-label: joid-baremetal
@@ -64,12 +64,12 @@
slave-label: joid-baremetal
installer: joid
auto-trigger-name: 'daily-trigger-disabled'
- <<: *brahmaputra
+ <<: *colorado
- virtual:
slave-label: joid-virtual
installer: joid
auto-trigger-name: 'daily-trigger-disabled'
- <<: *brahmaputra
+ <<: *colorado
# compass CI PODs
- baremetal:
@@ -86,12 +86,12 @@
slave-label: compass-baremetal
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *brahmaputra
+ <<: *colorado
- virtual:
slave-label: compass-virtual
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *brahmaputra
+ <<: *colorado
#--------------------------------
# Installers not using labels
# CI PODs
@@ -107,7 +107,7 @@
slave-label: '{pod}'
installer: apex
auto-trigger-name: 'daily-trigger-disabled'
- <<: *brahmaputra
+ <<: *colorado
#--------------------------------
# None-CI PODs
#--------------------------------