From 5e0be3d70edee91a5f00814dc5541b1774d297c1 Mon Sep 17 00:00:00 2001 From: efiacor Date: Fri, 9 Apr 2021 11:01:35 +0100 Subject: [PATCH] [DMAAP] Move old branche jobs to cron '' Change-Id: I3e2a21c3ed745f5bb82c70153ebb692595bb3a15 Signed-off-by: efiacor Issue-ID: DMAAP-1587 --- jjb/dmaap/dmaap-buscontroller.yaml | 22 ++++++++++++++--- jjb/dmaap/dmaap-dbcapi.yaml | 24 +++++++++++++++---- jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml | 22 +++++++++++++++-- jjb/dmaap/dmaap-messagerouter-kafka.yaml | 19 +++++++++++++++ jjb/dmaap/dmaap-messagerouter-messageservice.yaml | 28 +++++++++++----------- jjb/dmaap/dmaap-messagerouter-mirroragent.yaml | 18 +++++++++++++- jjb/dmaap/dmaap-messagerouter-msgrtr.yaml | 29 +++++++++++------------ jjb/dmaap/dmaap-messagerouter-zookeeper.yaml | 20 ++++++++++++++++ 8 files changed, 143 insertions(+), 39 deletions(-) diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 2c3de532a..68bffef9c 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -22,6 +22,24 @@ stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-buscontroller-settings' + files: '**' + archive-artifacts: '' + java-version: openjdk11 + +- project: + name: dmaap-buscontroller-maintenance-java11 + project-name: 'dmaap-buscontroller-maintenance' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + mvn-goals: 'clean package -P docker docker:build docker:push' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'dmaap/buscontroller' + stream: - 'honolulu': branch: 'honolulu' - 'guilin': @@ -30,9 +48,7 @@ files: '**' archive-artifacts: '' java-version: openjdk11 - -# removed sonar job from this template because this repo only builds a docker container -# and the 0% coverage report from Sonar was causing repeated escalations. + cron: '' - project: name: dmaap-buscontroller-clm diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index b61a15cab..c711ecb32 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -17,18 +17,34 @@ stream: - 'master': branch: 'master' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + +- project: + name: dmaap-dbcapi-java11-maintenance + project-name: 'dmaap-dbcapi-maintenance' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'dmaap/dbcapi' + mvn-settings: 'dmaap-dbcapi-settings' + java-version: openjdk11 + stream: - 'honolulu': branch: 'honolulu' - 'guilin': branch: 'guilin' - # due to a strange macro / variable translation problem this needs to be - # passed as a string block to properly get the properties correctly defined - # in the job maven-deploy-properties: | deployAtEnd=true files: '**' archive-artifacts: '' - + cron: '' - project: name: dmaap-dbcapi-sonar diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index b1855ea8f..c43a685dc 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -1,7 +1,7 @@ --- - project: - name: dmaap-messagerouter-dmaapclient - project-name: 'dmaap-messagerouter-dmaapclient' + name: dmaap-messagerouter-dmaapclient-java11 + project-name: 'dmaap-messagerouter-dmaapclient-java11' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -15,6 +15,23 @@ stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' + files: '**' + archive-artifacts: '' + java-version: openjdk11 + +- project: + name: dmaap-messagerouter-dmaapclient-maintenance + project-name: 'dmaap-messagerouter-dmaapclient-maintenance' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + project: 'dmaap/messagerouter/dmaapclient' + stream: - 'honolulu': branch: 'honolulu' - 'guilin': @@ -22,6 +39,7 @@ mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' files: '**' archive-artifacts: '' + cron: '' - project: name: dmaap-messagerouter-dmaapclient-sonar diff --git a/jjb/dmaap/dmaap-messagerouter-kafka.yaml b/jjb/dmaap/dmaap-messagerouter-kafka.yaml index e469a1d60..42c312b94 100644 --- a/jjb/dmaap/dmaap-messagerouter-kafka.yaml +++ b/jjb/dmaap/dmaap-messagerouter-kafka.yaml @@ -17,6 +17,24 @@ stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-kafka11aaf-settings' + files: '**' + archive-artifacts: '' + +- project: + name: dmaap-kafka-maintenance + project-name: 'dmaap-kafka-maintenance' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-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: 'dmaap/kafka11aaf' + stream: - 'honolulu': branch: 'honolulu' - 'guilin': @@ -24,6 +42,7 @@ mvn-settings: 'dmaap-kafka11aaf-settings' files: '**' archive-artifacts: '' + cron: '' - project: name: dmaap-kafka-sonar diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 3340a05f0..9190793bb 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -1,7 +1,7 @@ --- - project: - name: dmaap-messagerouter-messageservice - project-name: 'dmaap-messagerouter-messageservice' + name: dmaap-messagerouter-messageservice-java-11 + project-name: 'dmaap-messagerouter-messageservice-java-11' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -11,22 +11,22 @@ maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dmaap/messagerouter/messageservice' stream: - - 'honolulu': - branch: 'honolulu' - - 'guilin': - branch: 'guilin' + - 'master': + branch: 'master' mvn-settings: 'dmaap-messagerouter-messageservice-settings' + java-version: openjdk11 files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: 'docker' - cron: '' - project: - name: dmaap-messagerouter-messageservice-java-11 - project-name: 'dmaap-messagerouter-messageservice-java-11' + name: dmaap-messagerouter-messageservice-maintenance + project-name: 'dmaap-messagerouter-messageservice-maintenance' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -36,18 +36,18 @@ maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g project: 'dmaap/messagerouter/messageservice' stream: - - 'master': - branch: 'master' + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-messagerouter-messageservice-settings' - java-version: openjdk11 files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: 'docker' + cron: '' - project: name: dmaap-messagerouter-messageservice-sonar diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index e5dd58872..1d476f91c 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -11,11 +11,26 @@ maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - project: 'dmaap/messagerouter/mirroragent' stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-messagerouter-mirroragent-settings' + files: '**' + archive-artifacts: '' + +- project: + name: dmaap-messagerouter-mirroragent-maintenance + project-name: 'dmaap-messagerouter-mirroragent-maintenance' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true8g + project: 'dmaap/messagerouter/mirroragent' + stream: - 'honolulu': branch: 'honolulu' - 'guilin': @@ -23,6 +38,7 @@ mvn-settings: 'dmaap-messagerouter-mirroragent-settings' files: '**' archive-artifacts: '' + cron: '' - project: name: dmaap-messagerouter-mirroragent-sonar diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index 9ff9e9b86..d3e388d29 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -1,7 +1,7 @@ --- - project: - name: dmaap-messagerouter-msgrtr - project-name: 'dmaap-messagerouter-msgrtr' + name: dmaap-messagerouter-msgrtr-java-11 + project-name: 'dmaap-messagerouter-msgrtr-java-11' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -9,21 +9,20 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dmaap/messagerouter/msgrtr' stream: - - 'honolulu': - branch: 'honolulu' - - 'guilin': - branch: 'guilin' + - 'master': + branch: 'master' mvn-settings: 'dmaap-messagerouter-msgrtr-settings' + java-version: openjdk11 files: '**' archive-artifacts: '' - cron: '' - project: - name: dmaap-messagerouter-msgrtr-java-11 - project-name: 'dmaap-messagerouter-msgrtr-java-11' + name: dmaap-messagerouter-msgrtr + project-name: 'dmaap-messagerouter-msgrtr' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -31,16 +30,16 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g project: 'dmaap/messagerouter/msgrtr' stream: - - 'master': - branch: 'master' + - 'honolulu': + branch: 'honolulu' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-messagerouter-msgrtr-settings' - java-version: openjdk11 files: '**' archive-artifacts: '' + cron: '' - project: name: dmaap-messagerouter-msgrtr-sonar diff --git a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml index d704af6b5..3258275e9 100644 --- a/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml +++ b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml @@ -15,6 +15,25 @@ stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-zookeeper-settings' + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + build-node: ubuntu1804-docker-8c-8g + +- project: + name: dmaap-zookeeper-maintenance + project-name: 'dmaap-zookeeper-maintenance' + jobs: + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + mvn-params: '-P docker -Dmaven.test.skip=true' + maven-versions-plugin: true + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'dmaap/zookeeper' + stream: - 'honolulu': branch: 'honolulu' - 'guilin': @@ -25,6 +44,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' build-node: ubuntu1804-docker-8c-8g + cron: '' - project: name: dmaap-zookeeper-info -- 2.16.6