Merge "Attempt to fix logging-analytics maven-stage-master job"

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index a4b04d2..efad526 100644 (file)
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -18,7 +18,7 @@
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-builder-4c-4g
       - gerrit-maven-docker-stage:
-          mvn-params: 'exec:exec -Pbuild-docker'
+          mvn-params: '-Dmaven.test.skip install exec:exec -Pbuild-docker'
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
index cc8ab2a..ed670f3 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml
@@ -23,7 +23,7 @@
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-          mvn-goals: 'clean install -Ddocker.skip'
+          mvn-goals: 'clean deploy -Ddocker.skip'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'

diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index e24155c..bb087d8 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -5,7 +5,8 @@
     project-name: 'dcaegen2-services'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
     subproject:
       - 'bbs-event-processor':
           pom: 'components/bbs-event-processor/pom.xml'
@@ -32,7 +33,7 @@
           version-properties-file: 'components/bbs-event-processor/version.properties'
           mvn-pom: 'components/bbs-event-processor/pom.xml'
           mvn-params: '-f components/bbs-event-processor/pom.xml'
-          mvn-goals: 'clean package -Ddockerfile.skip -f components/bbs-event-processor/pom.xml'
+          mvn-goals: 'clean deploy -Ddockerfile.skip -f components/bbs-event-processor/pom.xml'
           pattern: 'components/bbs-event-processor/**'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index d94bf4b..fc22150 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -24,6 +24,8 @@
           mvn-params: '-P docker'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'policy/apex-pdp'
     stream:

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 24af5a9..048d95e 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -18,6 +18,8 @@
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'policy/api'
     stream:

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 2085e1a..faf8b8a 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -9,6 +9,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'policy/common'
     stream:

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index c6950d2..4c2c03e 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -18,6 +18,8 @@
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'policy/distribution'
     stream:

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index 1a4d1ff..196fb2b 100644 (file)
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -15,6 +15,9 @@
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
+
     project: 'policy/docker'
     stream:
       - 'master':

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 478f281..a6dd4d8 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -18,6 +18,8 @@
           mvn-params: '-P docker'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'policy/drools-applications'
     stream:

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 3c8a380..1826044 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -18,6 +18,8 @@
           mvn-params: '-P docker'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'policy/drools-pdp'
     stream:

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 1506dc5..32651a7 100644 (file)
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -18,6 +18,8 @@
           mvn-params: '-P docker'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'policy/engine'
     stream:

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index b807d2d..d2a7da0 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -9,6 +9,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'policy/models'
     stream:

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 73727b0..a9ab05f 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -18,6 +18,8 @@
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'policy/pap'
     stream:

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index ff03067..5445a71 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -9,6 +9,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'policy/parent'
     stream:

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index feb9afe..a307904 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -18,6 +18,8 @@
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'policy/xacml-pdp'
     stream:

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 85efe1b..a519ad3 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -20,6 +20,8 @@
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'sdnc/apps'
     stream:

diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 9da5a83..88b407a 100644 (file)
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -8,6 +8,8 @@
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
 
     project: 'sdnc/northbound'
     stream:

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 56b6863..4af3a31 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -17,6 +17,8 @@
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-version: "mvn35"
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-builder-4c-4g
     project: 'sdnc/oam'
     stream:
       - 'master':