summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2018-04-04 17:21:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-04 17:21:24 +0000
commitf239cf753a2bc2c681b947c3be865fc96875f6b0 (patch)
treef5e3adc02918dc389ff20eab4ffcde86df8c9ac1
parentd679b9255574c6c007663e2c185d2fb322cc0951 (diff)
parentc207393aa20855ab625f3e03e2a3d5b498dc742d (diff)
Merge "Create Stable Branch Jobs for bottlenecks"
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml10
-rw-r--r--jjb/bottlenecks/bottlenecks-project-jobs.yml8
2 files changed, 12 insertions, 6 deletions
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 072117ae3..41b73a290 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -19,8 +19,8 @@
gs-packagepath: '/{suite}'
# docker tag used for version control
docker-tag: 'latest'
- euphrates: &euphrates
- stream: euphrates
+ fraser: &fraser
+ stream: fraser
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
gs-packagepath: '/{stream}/{suite}'
@@ -49,12 +49,12 @@
slave-label: compass-baremetal-branch
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
- virtual:
slave-label: compass-virtual-branch
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *euphrates
+ <<: *fraser
# -------------------------------
# None-CI PODs
@@ -63,7 +63,7 @@
# slave-label: '{pod}'
# installer: joid
# auto-trigger-name: 'daily-trigger-disabled'
- # <<: *euphrates
+ # <<: *fraser
# - orange-pod2:
# slave-label: '{pod}'
# installer: joid
diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml
index 93b2d913c..bebac995b 100644
--- a/jjb/bottlenecks/bottlenecks-project-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml
@@ -21,6 +21,11 @@
# This is used for different test suite dependent packages storage
gs-packagepath: '/{suite}'
disabled: false
+ - fraser: &fraser
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ gs-packagepath: '/{stream}/{suite}'
+ disabled: false
- euphrates:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
@@ -153,7 +158,8 @@
- string:
name: PACKAGE_URL
default: http://205.177.226.237:9999/bottlenecks{gs-packagepath}/
- description: "the url where we store the packages used for bottlenecks rubbos"
+ description: "the url where we store the packages used for bottlenecks\
+ \ rubbos"
####################################
# builders for bottlenecks project