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

diff --git a/jjb/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml
index 9066b41..68217cb 100644 (file)
--- 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 f0a072a..12c3397 100644 (file)
--- 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'