diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2020-04-29 16:43:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-29 16:43:11 +0000 |
| commit | 27fa7cecdd2649d6b8d43d4828da705681ed1726 (patch) | |
| tree | 02350b3c5ca62d38a1273c04d8fa58a912bc9ce9 /jjb | |
| parent | 89e330d3ba40f6048055f8545cf2ab3e6af1d95d (diff) | |
| parent | eadf1e78ef16e0e408b1165ec24b180e0548f472 (diff) | |
Merge "Use another docker jjb to build java11 in ONAP"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/integration/docker/integration-docker-onap-java11.yaml | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml index 512acc122..4ad47ab95 100644 --- a/jjb/integration/docker/integration-docker-onap-java11.yaml +++ b/jjb/integration/docker/integration-docker-onap-java11.yaml @@ -48,23 +48,16 @@ - project: name: 'integration-docker-onap-java11-docker' jobs: - - '{project-name}-{stream}-verify-docker' - - '{project-name}-{stream}-merge-docker' - - gerrit-maven-docker-stage: - mvn-params: '-P docker -Dmaven.test.skip=true' - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' + - gerrit-docker-verify + - gerrit-docker-merge project-name: 'integration-docker-onap-java11' project: 'integration/docker/onap-java11' stream: - 'master': - branch: 'master' - mvn-params: '-P spring-boot-2-1' - docker_name: 'onap/integration-java11' - docker_build_args: '-f ./Dockerfile' - docker_root: '$WORKSPACE' + branch: 'master' + files: '' + docker-name: 'onap/integration-java11' + docker-build-args: '-f ./Dockerfile' + docker-root: '$WORKSPACE' mvn-settings: 'integration-settings' - mvn-version: 'mvn35' - files: '**' build-node: ubuntu1804-docker-8c-8g |