diff options
author | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-10-19 18:40:20 -0700 |
---|---|---|
committer | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-10-23 21:36:42 +0000 |
commit | 44b9623d60d5e8f20f0a0429dd26445c68a865de (patch) | |
tree | 9a8b30b1e4683c480efc2b32965822f65ac6b7a4 /jjb | |
parent | 99297e2838a98b3cdeb687634b1c478d457c197b (diff) |
VFC-Refactor CLM project block
The clm job portion needs to be on its own
project section similar to the Sonar portion.
The reason behind this, is because we only want
this job to be running for master and no other
branches. Also, this is in preparation for the
work that is to come from global-jjb on application
names in CLM.
Change-Id: I28975b8279fa0b1f2f6fb57b76468db366e800e2
Issue-ID: CIMAN-213
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/vfc/vfc-gvnfm-vnflcm-java.yaml | 11 | ||||
-rw-r--r-- | jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml | 11 | ||||
-rw-r--r-- | jjb/vfc/vfc-gvnfm-vnfres-java.yaml | 11 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-catalog.yaml | 11 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-ems-java.yaml | 11 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-sfc.yaml | 11 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml | 13 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml | 11 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml | 13 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml | 13 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml | 13 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-lcm-java.yaml | 11 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-multivimproxy.yaml | 11 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-resmanagement.yaml | 11 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-wfengine-java.yaml | 11 |
15 files changed, 154 insertions, 19 deletions
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index 50d8ff5be..faf9d44ab 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -13,7 +13,6 @@ pom: 'lcm/pom.xml' pattern: 'lcm/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -39,3 +38,13 @@ mvn-settings: 'vfc-gvnfm-vnflcm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-gvnfm-vnflcm-java-clm + jobs: + - gerrit-maven-clm + project: vfc/gvnfm/vnflcm + project-name: 'vfc-gvnfm-vnflcm' + build-node: centos7-redis-4c-4g + branch: 'master' + mvn-settings: 'vfc-gvnfm-vnflcm-settings' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 817926b2d..f08054a15 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -12,7 +12,6 @@ pom: 'mgr/pom.xml' pattern: 'mgr/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -38,3 +37,13 @@ mvn-settings: 'vfc-gvnfm-vnfmgr-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-gvnfm-vnfmgr-java-clm + jobs: + - gerrit-maven-clm + project: vfc/gvnfm/vnfmgr + project-name: 'vfc-gvnfm-vnfmgr' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-gvnfm-vnfmgr-settings' diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index d2dda94a3..82d31fc75 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -13,7 +13,6 @@ pom: 'res/pom.xml' pattern: 'res/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -39,3 +38,13 @@ mvn-settings: 'vfc-gvnfm-vnfres-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-gvnfm-vnfres-java-clm + jobs: + - gerrit-maven-clm + project: vfc/gvnfm/vnfres + project-name: 'vfc-gvnfm-vnfres' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-gvnfm-vnfres-settings' diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index 50164ff70..3587f4005 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -13,7 +13,6 @@ path: '.' pattern: '**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -39,3 +38,13 @@ mvn-settings: 'vfc-nfvo-catalog-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-catalog-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/catalog + project-name: 'vfc-nfvo-catalog' + build-node: centos7-redis-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-catalog-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index 2e8b10c83..70bd630e0 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -13,7 +13,6 @@ pom: 'ems/pom.xml' pattern: 'ems/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -38,3 +37,13 @@ mvn-settings: 'vfc-nfvo-driver-ems-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-driver-ems-java-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/driver/ems + project-name: 'vfc-nfvo-driver-ems' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-ems-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 3b097847a..f754a2c1b 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -12,7 +12,6 @@ pom: 'zte/sfc-driver/pom.xml' pattern: 'zte/sfc-driver/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -38,3 +37,13 @@ mvn-settings: 'vfc-nfvo-driver-sfc-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-driver-sfc-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/driver/sfc + project-name: 'vfc-nfvo-driver-sfc' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-sfc-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 1dcdb3e51..86c4f7a7f 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -12,8 +12,6 @@ pom: 'huawei/pom.xml' pattern: 'huawei/**' jobs: - - gerrit-maven-clm: - mvn-params: '-f huawei/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -34,3 +32,14 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-driver-svnfm-huawei-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f huawei/pom.xml' + project: vfc/nfvo/driver/vnfm/svnfm + project-name: 'vfc-nfvo-driver-svnfm-huawei' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index 12ffa5d60..456e38123 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -13,7 +13,6 @@ pom: 'gvnfmadapter/pom.xml' pattern: 'gvnfmadapter/**' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -39,3 +38,13 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-driver-vnfm-gvnfm-java-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/driver/vnfm/gvnfm + project-name: 'vfc-nfvo-driver-vnfm-gvnfm' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml index 3c3601dcb..d32067aa3 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml @@ -12,8 +12,6 @@ pom: 'nokia/vnfmdriver/pom.xml' pattern: 'nokia/vnfmdriver/**' jobs: - - gerrit-maven-clm: - mvn-params: '-f nokia/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -34,3 +32,14 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-driver-vnfm-svnfm-nokia-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f nokia/pom.xml' + project: vfc/nfvo/driver/vnfm/svnfm + project-name: 'vfc-nfvo-driver-svnfm-nokia' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml index 22840cd94..fc8a0db5c 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml @@ -12,8 +12,6 @@ pom: 'nokiav2/pom.xml' pattern: 'nokiav2/**' jobs: - - gerrit-maven-clm: - mvn-params: '-f nokiav2/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -74,3 +72,14 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-builder-4c-4g + +- project: + name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f nokiav2/pom.xml' + project: vfc/nfvo/driver/vnfm/svnfm + project-name: 'vfc-nfvo-driver-svnfm-nokiav2' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' 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 8ff31975d..f3d376483 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -12,8 +12,6 @@ pom: 'zte/vmanager/pom.xml' pattern: 'zte/vmanager/**' jobs: - - gerrit-maven-clm: - mvn-params: '-f zte/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -34,3 +32,14 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-driver-vnfm-svnfm-zte-java-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f zte/pom.xml' + project: vfc/nfvo/driver/vnfm/svnfm + project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index 743beff51..25d0f053a 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -8,7 +8,6 @@ branch: 'master' mvn-settings: 'vfc-nfvo-lcm-settings' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -33,3 +32,13 @@ mvn-settings: 'vfc-nfvo-lcm-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-lcm-java-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/lcm + project-name: 'vfc-nfvo-lcm' + build-node: centos7-redis-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-lcm-settings' diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml index f6bb29fa6..4ca4852fa 100644 --- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml +++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml @@ -9,7 +9,6 @@ branch: 'master' build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -31,3 +30,13 @@ mvn-settings: 'vfc-nfvo-multivimproxy-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-multivimproxy-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/multivimproxy + project-name: 'vfc-nfvo-multivimproxy' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-multivimproxy-settings' diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index 964ef4676..ba51b7dc2 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -9,7 +9,6 @@ branch: 'master' build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -31,3 +30,13 @@ mvn-settings: 'vfc-nfvo-resmanagement-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-resmanagement-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/resmanagement + project-name: 'vfc-nfvo-resmanagement' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-resmanagement-settings' diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index 1a665e6e4..29ee2a07d 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -19,7 +19,6 @@ script: !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' @@ -55,3 +54,13 @@ mvn-settings: 'vfc-nfvo-wfengine-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vfc-nfvo-wfengine-clm + jobs: + - gerrit-maven-clm + project: vfc/nfvo/wfengine + project-name: 'vfc-nfvo-wfengine' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vfc-nfvo-wfengine-settings' |