diff options
| m--------- | global-jjb | 0 | ||||
| -rw-r--r-- | jjb/aaf/aaf-authz.yaml | 2 | ||||
| -rw-r--r-- | jjb/clamp/clamp.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml | 5 | ||||
| -rw-r--r-- | jjb/logging-analytics/logging-analytics.yaml | 4 | ||||
| -rw-r--r-- | jjb/music/music.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-apps.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-northbound.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-oam.yaml | 2 |
10 files changed, 15 insertions, 8 deletions
diff --git a/global-jjb b/global-jjb -Subproject 2a557e77bcfc2556e2eeaf383033e119de91b1b +Subproject 36bdbac77603d827912429a2db0794176564089 diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index a4b04d2fa..efad52617 100644 --- 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/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index 901d84474..fa169ef71 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -24,6 +24,8 @@ mvn_properties: - docker.pull.registry=nexus3.onap.org:10001 - docker.push.registry=nexus3.onap.org:10003 + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'clamp' stream: diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index cc8ab2af7..ed670f3de 100644 --- 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 e24155cdd..bb087d8bc 100644 --- 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/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 50f042df6..aa8c24600 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -74,10 +74,6 @@ 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}-{subproject}-python-staging-{stream}' - '{project-name}-{subproject}-python-release-{stream}' files: '**' diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index a69bb7eb3..abf404f0b 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -21,6 +21,8 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-builder-4c-4g project: 'music' stream: - 'master': diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 85efe1b96..a519ad361 100644 --- 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 9da5a8342..88b407a9e 100644 --- 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 56b68639a..4af3a3130 100644 --- 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': |