From a24198eb491e8ba65124b8de923075730545ace7 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Mon, 4 Feb 2019 14:20:56 -0800 Subject: Migrate to gerrit-maven-stage (VFC) 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: I1ee12b9f92e7a230886ba39cf09cafc4446c688d Issue-ID: CIMAN-234 Signed-off-by: Jessica Wagantall --- jjb/vfc/vfc-gvnfm-vnflcm-java.yaml | 4 ++ jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml | 4 ++ jjb/vfc/vfc-gvnfm-vnfres-java.yaml | 4 ++ jjb/vfc/vfc-nfvo-catalog.yaml | 4 ++ jjb/vfc/vfc-nfvo-db.yaml | 4 ++ jjb/vfc/vfc-nfvo-driver-ems-java.yaml | 4 ++ jjb/vfc/vfc-nfvo-driver-sfc.yaml | 6 +++ jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml | 6 +++ jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml | 6 +++ jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml | 6 +++ jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml | 5 +++ jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml | 6 +++ jjb/vfc/vfc-nfvo-lcm-java.yaml | 4 ++ jjb/vfc/vfc-nfvo-multivimproxy.yaml | 4 ++ jjb/vfc/vfc-nfvo-resmanagement.yaml | 4 ++ jjb/vfc/vfc-nfvo-wfengine-java.yaml | 52 ++++++++++++++++++++++++ 16 files changed, 123 insertions(+) diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index 2442077ef..f338076a8 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -20,6 +20,10 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 1264efda5..2120be71b 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -14,6 +14,10 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index e9fa8fe5c..7deaecdab 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -15,6 +15,10 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index 81b452742..8458c0c4c 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -16,6 +16,10 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index 86f9e5cb2..d5f000eba 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -11,6 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index e2955519b..9a25fc493 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -15,6 +15,10 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 10ea310aa..6050cdc02 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -14,6 +14,12 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'zte/sfc-driver/pom.xml' + mvn-params: '-f zte/sfc-driver/pom.xml' - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 46a0e3c1f..5e6e59779 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -14,6 +14,12 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'huawei/pom.xml' + mvn-params: '-f huawei/pom.xml' - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index ac8c87e0f..9fdbd585a 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -15,6 +15,12 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'gvnfmadapter/pom.xml' + mvn-params: '-f gvnfmadapter/pom.xml' - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml index abcf1ed2d..998a30c78 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml @@ -14,6 +14,12 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'nokiav2/pom.xml' + mvn-params: '-f nokiav2/pom.xml' - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: 'nokiav2/**' archive-artifacts: '' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml index 1dd3cff8d..7dd3c6759 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml @@ -15,6 +15,11 @@ - '{project-name}-{stream}-merge-profile-java': build-node: ubuntu1604-docker-8c-8g pattern: 'pom.xml' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-params: '-P rootOnly' - '{project-name}-{stream}-release-version-profile-java-daily' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml index 366366360..b7391d9b6 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -14,6 +14,12 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'zte/vmanager/pom.xml' + mvn-params: '-f zte/vmanager/pom.xml' - '{project-name}-{stream}-{subproject}-release-version-java-daily' files: '**' archive-artifacts: '' diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index 2805ea95f..9c8883a6b 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -10,6 +10,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml index 935ffcaad..8786bc674 100644 --- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml +++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml @@ -11,6 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index 7ebfd06cf..868df72ed 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -11,6 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index 9664d08e9..8f17b51f6 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -28,6 +28,58 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +- project: + name: vfc-nfvo-wfengine-engine-mgr-service-stage + project-name: 'vfc-nfvo-wfengine-engine-mgr-service' + project: 'vfc/nfvo/wfengine' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vfc-nfvo-wfengine-settings' + subproject: + - 'engine-mgr-service': + pom: 'wfenginemgrservice/pom.xml' + pattern: 'wfenginemgrservice/**' + script: + !include-raw-escape: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'wfenginemgrservice/pom.xml' + mvn-params: '-f wfenginemgrservice/pom.xml' + + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + +- project: + name: vfc-nfvo-wfengine-engine-activiti-extension-stage + project-name: 'vfc-nfvo-wfengine-engine-activiti-extension' + project: 'vfc/nfvo/wfengine' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vfc-nfvo-wfengine-settings' + subproject: + - 'engine-activiti-extension': + pom: 'activiti-extension/pom.xml' + pattern: 'activiti-extension/**' + script: + !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'activiti-extension/pom.xml' + mvn-params: '-f activiti-extension/pom.xml' + + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + - project: name: vfc-nfvo-wfengine-wfenginemgrservice-sonar jobs: -- cgit 1.2.3-korg