From f225a63520200cbb8092e7e600db71d8ab0f43ae Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Mon, 15 Jul 2019 10:50:03 -0700 Subject: Migrate to gerrit-maven-stage (SDC)-2 Migrate to use gerrit-maven-stage from global-jjb to allow the generation of signed release artifacts that will reduce release processing time. Change-Id: Icc9ab796630b1179bda286b7d1cd034f493530cb Issue-ID: CIMAN-234 Signed-off-by: Jessica Wagantall --- jjb/sdc/sdc-dcae-d-ci.yaml | 16 ++++++++++------ jjb/sdc/sdc-dcae-d-dt-be-property.yaml | 5 ++++- jjb/sdc/sdc-dcae-d-dt.yaml | 17 +++++++++++------ jjb/sdc/sdc-dcae-d-fe.yaml | 17 +++++++++++------ jjb/sdc/sdc-dcae-d-tosca-lab.yaml | 8 ++++++-- jjb/sdc/sdc-sdc-workflow-designer.yaml | 13 ++++++++++--- 6 files changed, 52 insertions(+), 24 deletions(-) (limited to 'jjb/sdc') diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml index 52547b224..a75440883 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -10,13 +10,17 @@ project-name: 'sdc-dcae-d-ci' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-docker-version-java-daily': - build-node: 'ubuntu1604-docker-8c-8g' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-DskipTests=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -DskipTests=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'sdc/dcae-d/ci' stream: - 'master': diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml index 08044a1fb..39f1c090e 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml @@ -4,8 +4,11 @@ project-name: 'sdc-dcae-d-dt-be-property' jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'sdc/dcae-d/dt-be-property' stream: - 'master': diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index ee6eec04d..a334d759d 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -5,13 +5,18 @@ build-node: ubuntu1604-builder-4c-2g jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-docker-version-java-daily': - build-node: 'ubuntu1604-docker-8c-8g' - docker-pom: 'pom.xml' - mvn-profile: 'server,docker' - mvn-params: '-DskipTests=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P server,docker -DskipTests=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'sdc/dcae-d/dt' stream: - 'master': diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index 4f459d5f1..8e4149dc1 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -5,13 +5,18 @@ build-node: ubuntu1604-builder-4c-2g jobs: - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-docker-version-java-daily': - build-node: 'ubuntu1604-docker-8c-8g' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-DskipTests=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -DskipTests=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'sdc/dcae-d/fe' stream: - 'master': diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index 397b82957..71c7dbe32 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -14,8 +14,12 @@ build-node: ubuntu1604-docker-8c-8g jobs: - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P default -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' docker-pom: 'pom.xml' mvn-profile: 'default' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index b20422991..3a258e506 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -11,10 +11,17 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: build-node: ubuntu1604-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'sdc/sdc-workflow-designer' stream: - 'master': -- cgit 1.2.3-korg