summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormei mei <meimei@huawei.com>2018-10-26 10:19:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-26 10:19:07 +0000
commit2b8a30872c4d1e5fe9dbe310ba206522c02115b8 (patch)
tree703972c37de9d7b6bb4c482820d63e5cdf0fed4a
parente6299bccbdd31edf276577dac10f0971251fc893 (diff)
parent3e3972a94f8ee341981a3c631ffc7e46ebbe628b (diff)
Merge "[compass4nfv]Add missing jobs"
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yaml8
-rw-r--r--jjb/dovetail/dovetail-ci-jobs.yaml16
2 files changed, 20 insertions, 4 deletions
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yaml b/jjb/bottlenecks/bottlenecks-ci-jobs.yaml
index 4c302dd52..0a48eedf5 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yaml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yaml
@@ -19,8 +19,8 @@
gs-packagepath: '/{suite}'
# docker tag used for version control
docker-tag: 'latest'
- fraser: &fraser
- stream: fraser
+ gambia: &gambia
+ stream: gambia
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'
- <<: *fraser
+ <<: *gambia
- virtual:
slave-label: compass-virtual-branch
installer: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *fraser
+ <<: *gambia
# -------------------------------
# None-CI PODs
diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml
index e3b87c7cb..02a33ccdb 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yaml
+++ b/jjb/dovetail/dovetail-ci-jobs.yaml
@@ -26,6 +26,12 @@
dovetail-branch: 'stable/{stream}'
gs-pathname: '/{stream}'
docker-tag: 'ovp-2.0.0'
+ gambia: &gambia
+ stream: gambia
+ branch: 'stable/{stream}'
+ dovetail-branch: 'master'
+ gs-pathname: '/{stream}'
+ docker-tag: 'latest'
# ----------------------------------
# POD, PLATFORM, AND BRANCH MAPPING
@@ -81,6 +87,16 @@
SUT: compass
auto-trigger-name: 'daily-trigger-disabled'
<<: *fraser
+ - baremetal:
+ slave-label: compass-baremetal
+ SUT: compass
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *gambia
+ - virtual:
+ slave-label: compass-virtual
+ SUT: compass
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *gambia
# -------------------------------
# Installers not using labels
# CI PODs