summaryrefslogtreecommitdiffstats
path: root/jjb/integration/xtesting
diff options
context:
space:
mode:
authormrichomme <morgan.richomme@orange.com>2020-08-14 15:58:02 +0200
committerJessica Wagantall <jwagantall@linuxfoundation.org>2020-08-25 16:48:52 +0000
commit2a2f3a725498fcac98351fce07bd99d9f1513db8 (patch)
treeb703ded7fbaeb9c6d4e3c2963ea36a739a8f6aec /jjb/integration/xtesting
parent7b4834d9357498a27ee77a4416c45e9f619a07b9 (diff)
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 <morgan.richomme@orange.com> Change-Id: I9e486fd3bd523ba02ddc40f69ad3bfdd7005ce67 Signed-off-by: mrichomme <morgan.richomme@orange.com>
Diffstat (limited to 'jjb/integration/xtesting')
-rw-r--r--jjb/integration/xtesting/integration-xtesting.yaml21
1 files changed, 1 insertions, 20 deletions
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
@@ -89,26 +89,6 @@
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
docker-name: 'onap/xtesting-security'
@@ -130,3 +110,4 @@
mvn-settings: 'integration-settings'
build-node: ubuntu1804-docker-8c-8g
cron: '@daily'
+ container-tag-method: stream