diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2020-08-25 17:34:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-08-25 17:34:26 +0000 |
| commit | 071e7f15cb386add41c1a4cc4977a15402d662de (patch) | |
| tree | e8c7dd91d28a774bf66b029a91bb754c87f31495 /jjb | |
| parent | 9d81acdb30dffffe6f0ef46ad5c13cc10cb62311 (diff) | |
| parent | 2a2f3a725498fcac98351fce07bd99d9f1513db8 (diff) | |
Merge "Try to set the docker tag to the branch when not master"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/integration/xtesting/integration-xtesting.yaml | 21 |
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 |