Merge "Migrate to gerrit-maven-stage (CLI)"
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index f5763e0..6f0072c 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -14,6 +14,17 @@
mvn-params: '-Dmaven.test.skip=true'
disabled: 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
+ 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: 'policy/api'
stream:
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 23df1d0..b9f6c78 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -7,6 +7,10 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
disabled: true
+ - gerrit-maven-stage:
+ sign-artifacts: true
+ build-node: centos7-builder-4c-4g
+ maven-versions-plugin: true
project: 'policy/models'
stream:
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index bd57635..2867726 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -14,6 +14,17 @@
mvn-params: '-Dmaven.test.skip=true'
disabled: 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
+ 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: 'policy/pap'
stream:
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index f338076..0bf14a5 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -24,7 +24,6 @@
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'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 2120be7..7a9a5d2 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -18,7 +18,6 @@
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'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 7deaecd..41fe317 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -19,7 +19,6 @@
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'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index 8458c0c..27762f9 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -20,7 +20,6 @@
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'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
index d5f000e..30200de 100644
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@ -15,7 +15,6 @@
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'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index 9a25fc4..9ca9178 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -19,7 +19,6 @@
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'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index 6050cdc..aa4e8c6 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -20,7 +20,6 @@
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'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 5e6e597..6bb4318 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -20,7 +20,6 @@
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: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 9fdbd58..17fa14f 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -21,7 +21,6 @@
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'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
index 788b8fb..2fea7c7 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-juju.yaml
@@ -15,7 +15,6 @@
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-{subproject}-release-version-java-daily'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
index 998a30c..3ba98f6 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
@@ -20,7 +20,6 @@
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: ''
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 b7391d9..2bb739e 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -20,7 +20,6 @@
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: ''
build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 9c8883a..ecfa23a 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -14,7 +14,6 @@
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'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
index 8786bc6..c5de861 100644
--- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
@@ -15,7 +15,6 @@
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'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 868df72..b377c03 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -15,7 +15,6 @@
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'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 8f17b51..1f89eae 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -21,7 +21,6 @@
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-{subproject}-release-version-java-daily'
- '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
mvn-goals: 'clean'
files: '**'