diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2019-07-12 13:19:19 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2019-07-12 13:19:19 -0700 |
| commit | ff4f4a88340c3683ba78d5cd11380ea5c7924270 (patch) | |
| tree | 8a5e721e4d9e235066bb1e8e9b3d31e42bb478f2 | |
| parent | bb1b24894d9a91daec537acccc01096f5aa5d3f1 (diff) | |
Add DCAE maven-stage fixes
- Use docker node for neede projects
- Remove deprecated jobs
- Skip signing for Docker jobs as there are no
jars being produced.
Change-Id: I2192818e0e0d5f3dfbd23a54a0f1102027ca8dbd
Issue-ID: CIMAN-250
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 10 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml | 7 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml | 8 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-sdk.yaml | 1 |
4 files changed, 4 insertions, 22 deletions
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index 7cc2dbd37..90525f61c 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -21,18 +21,12 @@ mvn-goals: 'clean install' - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-shell-daily': - mvn-goals: 'clean deploy -DskipNexusStagingDeployMojo=true -DskipDockerPush=false' - # No-op - script: '/bin/true' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false' diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index 586ba645a..de6d9ac91 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -5,18 +5,11 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-shell-daily': - mvn-goals: 'clean package docker:build -DpushImage' - # No-op - script: '/bin/true' - build-node: 'ubuntu1604-docker-8c-8g' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - sign-artifacts: true build-node: centos7-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 8de9d2bc9..33da0acbe 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -19,20 +19,16 @@ archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g jobs: - - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' - - '{project-name}-{stream}-docker-java-shell-daily': - script: '/bin/true' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: ubuntu1604-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version' diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index a3424473d..f69f3d8e9 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -5,7 +5,6 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-docker-8c-8g |