summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrice Buriez <patrice.buriez@intel.com>2018-10-03 23:48:06 +0200
committerPatrice Buriez <patrice.buriez@intel.com>2018-10-04 14:19:03 +0200
commit71919978facbc9687585e7983c301f506b8be675 (patch)
tree182c69e16996e195d8bce71ba646f2b9e1b8425f
parent3b57a3186e22e0c2e638f24d01f0e2543bb0263d (diff)
Enable yardstick-docker-build-push-gambia job
It replaces the yardstick-docker-build-push-fraser job, because the logic in jjb/releng/opnfv-docker.sh L106-L119 has limited options for docker image tags: - 'latest', for git commits on master branch - tag-name, for git tags - 'stable' otherwise, i.e. for git commits on *any* stable branch. This means we can have only one (stable) job building and pushing docker images, in order to prevent the 'stable'-tagged image from switching between fraser and gambia contents, depending on the stable branch where the most recent change was cherry-picked and committed. Unfortunately, disabling the yardstick-docker-build-push-fraser job also means that further git tags on the stable/fraser branch will not result anymore in building and pushing new docker images with the intended tag-name and contents. Change-Id: Ieec1cdc6230e4c000c159cd743c587561c788fc3 Signed-off-by: Patrice Buriez <patrice.buriez@intel.com>
-rw-r--r--jjb/releng/opnfv-docker.yaml4
1 files changed, 2 insertions, 2 deletions
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'