From 00f6fed707f0f431b6da44cb37d5b3ec544d2ad4 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Wed, 3 Jul 2019 16:13:15 -0400 Subject: [PATCH] Switch to using global jjb jobs Issue-ID: AAI-2486 Issue-ID: AAI-2487 Issue-ID: AAI-2488 Issue-ID: AAI-2489 Issue-ID: AAI-2490 Issue-ID: AAI-2491 Issue-ID: AAI-2492 Issue-ID: AAI-2494 Issue-ID: AAI-2495 Issue-ID: AAI-2496 Issue-ID: AAI-2497 Issue-ID: AAI-2498 Issue-ID: AAI-2499 Issue-ID: AAI-2500 Issue-ID: AAI-2501 Signed-off-by: Jimmy Forsyth Change-Id: I9aad7cbe1ef74d615d478921a0e359d2567c62e9 --- jjb/aai/aai-data-router.yaml | 12 ++++++++---- jjb/aai/aai-esr-gui.yaml | 11 ++++++++--- jjb/aai/aai-esr-server.yaml | 11 ++++++++--- jjb/aai/aai-gallifrey.yaml | 14 +++++++++----- jjb/aai/aai-gizmo.yaml | 12 ++++++++---- jjb/aai/aai-model-loader.yaml | 12 ++++++++---- jjb/aai/aai-resources.yaml | 13 ++++++++----- jjb/aai/aai-search-data-service.yaml | 12 ++++++++---- jjb/aai/aai-sparky-be.yaml | 12 ++++++++---- jjb/aai/aai-sparky-fe.yaml | 5 ++++- jjb/aai/aai-spike.yaml | 12 ++++++++---- jjb/aai/aai-traversal.yaml | 13 ++++++++----- jjb/aai/aai-validation.yaml | 12 ++++++++---- 13 files changed, 101 insertions(+), 50 deletions(-) diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index fa6dea7f0..efd7409ce 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/data-router' stream: - 'dublin': diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml index a2920fee5..98d9842cf 100644 --- a/jjb/aai/aai-esr-gui.yaml +++ b/jjb/aai/aai-esr-gui.yaml @@ -11,10 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/esr-gui' stream: - 'master': diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 5cee139eb..7d37d1cc1 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -11,10 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/esr-server' stream: - 'master': diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml index ef82b0c4c..e4e520050 100644 --- a/jjb/aai/aai-gallifrey.yaml +++ b/jjb/aai/aai-gallifrey.yaml @@ -5,11 +5,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'clean package dockerfile:build dockerfile:push' - 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: + mvn-params: 'package dockerfile:build dockerfile:push -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/gallifrey' stream: - 'dublin': diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml index 2f2c88122..35aad1dbd 100644 --- a/jjb/aai/aai-gizmo.yaml +++ b/jjb/aai/aai-gizmo.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/gizmo' stream: - 'dublin': diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index e52577268..10e88067a 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/model-loader' stream: - 'dublin': diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index d5d5c2a7f..5470e3053 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -11,12 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'aai-resources/pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/resources' stream: - 'master': diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index e5ae2e686..7bb29b7bd 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'search-data-service-app/pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/search-data-service' docker-image-name: 'onap/search-data-service' stream: diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index be35736fd..046d1a1c1 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'sparkybe-onap-application/pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/sparky-be' stream: - 'dublin': diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index c75d5bf49..01bfccaed 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -6,7 +6,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'aai/sparky-fe' stream: - 'dublin': diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml index 663240d72..7f989a514 100644 --- a/jjb/aai/aai-spike.yaml +++ b/jjb/aai/aai-spike.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/spike' stream: - 'dublin': diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 8c64aa0fd..be4708d1f 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -11,12 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'aai-traversal/pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/traversal' stream: - 'master': diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index c740de7e0..04c104b03 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -11,11 +11,15 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'pom.xml' - mvn-goals: 'docker:build' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + mvn-params: 'docker:build -B -Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' project: 'aai/validation' stream: - 'dublin': -- 2.16.6