summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-10-04 20:02:05 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-04 20:02:05 +0000
commit76cfe3d847d74073feb735077790fa2c77574a79 (patch)
tree5714c55f9d2e8c669cd6c71aafade53d83aa6ff4
parentf63d4bda4c6dd54d22991b7577df7f885a95f90f (diff)
parentc87b46610c46bb0f0f87235f47b31f6d0e9874eb (diff)
Merge changes from topic 'yardstick-docker-gambia'
* changes: Enable yardstick-docker-build-arm-push-gambia job Make Gambia stream available to ARM Docker builds Enable yardstick-docker-build-push-gambia job
-rw-r--r--jjb/releng/opnfv-docker-arm.yaml6
-rw-r--r--jjb/releng/opnfv-docker.yaml4
2 files changed, 7 insertions, 3 deletions
diff --git a/jjb/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml
index 9066b419e..68217cbd0 100644
--- a/jjb/releng/opnfv-docker-arm.yaml
+++ b/jjb/releng/opnfv-docker-arm.yaml
@@ -19,6 +19,10 @@
stream: fraser
branch: 'stable/{stream}'
disabled: false
+ gambia: &gambia
+ stream: gambia
+ branch: 'stable/{stream}'
+ disabled: false
dovetail-arm-receivers: &dovetail-arm-receivers
receivers: >
cristina.pauna@enea.com
@@ -129,7 +133,7 @@
<<: *storperf-arm-receivers
- 'yardstick':
project: 'yardstick'
- <<: *fraser
+ <<: *gambia
<<: *yardstick-arm-receivers
# yamllint enable rule:key-duplicates
diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index f0a072ad0..12c3397d8 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -286,8 +286,8 @@
<<: *storperf-receivers
- 'yardstick':
project: 'yardstick'
- <<: *fraser
- <<: *other-receivers
+ <<: *gambia
+ <<: *yardstick-receivers
# projects with jobs for fraser
- 'bottlenecks':
project: 'bottlenecks'