From 2a2f3a725498fcac98351fce07bd99d9f1513db8 Mon Sep 17 00:00:00 2001 From: mrichomme Date: Fri, 14 Aug 2020 15:58:02 +0200 Subject: Try to set the docker tag to the branch when not master when the jjb with the stream frankfurt is triggered I would like to use the tag frankfurt so set the docker tag based on the stream information I am not sure it is the right way... It is not a "release", it is just the latest of the frankfurt branch Issue-ID: INT-1683 Signed-off-by: mrichomme Change-Id: I9e486fd3bd523ba02ddc40f69ad3bfdd7005ce67 Signed-off-by: mrichomme --- jjb/integration/xtesting/integration-xtesting.yaml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'jjb/integration/xtesting') diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 7e634a118..5cbce4e84 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -88,26 +88,6 @@ docker-root: ./smoke-usecases-robot docker-name: 'onap/xtesting-smoke-usecases-robot' docker-build-args: '-f ./docker/Dockerfile' - - gerrit-docker-verify: - project-name: 'integration-xtesting-benchmarking' - docker-root: ./benchmarking - docker-name: 'onap/xtesting-benchmarking' - docker-build-args: '-f ./docker/Dockerfile' - - gerrit-docker-merge: - project-name: 'integration-xtesting-benchmarking' - docker-root: ./benchmarking - docker-name: 'onap/xtesting-benchmarking' - docker-build-args: '-f ./docker/Dockerfile' - - gerrit-docker-verify: - project-name: 'integration-xtesting-candidate-usecases' - docker-root: ./candidate-usecases - docker-name: 'onap/xtesting-candidate-usecases' - docker-build-args: '-f ./docker/Dockerfile' - - gerrit-docker-merge: - project-name: 'integration-xtesting-candidate-usecases' - docker-root: ./candidate-usecases - docker-name: 'onap/xtesting-candidate-usecases' - docker-build-args: '-f ./docker/Dockerfile' - gerrit-docker-verify: project-name: 'integration-xtesting-security' docker-root: ./security @@ -130,3 +110,4 @@ mvn-settings: 'integration-settings' build-node: ubuntu1804-docker-8c-8g cron: '@daily' + container-tag-method: stream -- cgit 1.2.3-korg