From ac9f98aa608b8a8b6e35701cd0b472e0bc40af96 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Fri, 19 Oct 2018 14:26:38 -0700 Subject: DCAEGEN2-Refactor CLM project block The clm job portion needs to be on its own project section similar to the Sonar portion. The reason behind this, is because we only want this job to be running for master and no other branches. Also, this is in preparation for the work that is to come from global-jjb on application names in CLM. Change-Id: I47585bc0e3baebea06c3062fe77e88eeeac8e756 Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall --- jjb/dcaegen2/apod-analytics.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-analytics-pnda.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-collectors-datafile.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 10 +++++++++- jjb/dcaegen2/dcaegen2-collectors-restconf.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-deployments.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-platform-blueprints.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-platform-cli.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-platform-configbinding.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-platform-plugins.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-services-heartbeat.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-services-mapper.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-services-prh.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2-utils.yaml | 11 ++++++++++- jjb/dcaegen2/dcaegen2.yaml | 10 +++++++++- 23 files changed, 228 insertions(+), 23 deletions(-) (limited to 'jjb') diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml index c3d7720b4..79bb19f98 100644 --- a/jjb/dcaegen2/apod-analytics.yaml +++ b/jjb/dcaegen2/apod-analytics.yaml @@ -18,7 +18,6 @@ build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-verify-java': mvn-params: '-DskipTests=true' @@ -36,3 +35,13 @@ mvn-settings: 'dcaegen2-analytics-tca-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-analytics-tca-clm + jobs: + - gerrit-maven-clm + project: 'dcaegen2/analytics/tca' + project-name: 'dcaegen2-analytics-tca' + branch: 'master' + build-node: ubuntu1604-builder-4c-4g + mvn-settings: 'dcaegen2-analytics-tca-settings' diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml index f127a4927..904f749ce 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml @@ -15,7 +15,6 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -31,3 +30,13 @@ mvn-settings: 'dcaegen2-analytics-pnda-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-analytics-pnda-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/analytics/pnda + build-node: ubuntu1604-builder-4c-4g + project-name: 'dcaegen2-analytics-pnda' + branch: 'master' + mvn-settings: 'dcaegen2-analytics-pnda-settings' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 47b0d58bd..82129efdc 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -15,7 +15,6 @@ archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java': - '{project-name}-{stream}-merge-java': mvn-goals: 'clean install' @@ -37,3 +36,13 @@ mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-analytics-tca-gen2-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/analytics/tca-gen2 + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-analytics-tca-gen2' + branch: 'master' + mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 165295eb7..8a230b2c4 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -15,7 +15,6 @@ archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-collectors-datafile-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-collectors-datafile-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/collectors/datafile + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-collectors-datafile' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-datafile-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index 2508076de..b9caca737 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -15,7 +15,6 @@ archive-artifacts: 'hv-collector-coverage/target/site/jacoco-aggregate,**/target/reports/detekt-report.html' build-node: ubuntu1604-docker-8c-8g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' - '{project-name}-{stream}-merge-java': @@ -26,3 +25,12 @@ # No-op script: '/bin/true' +- project: + name: dcaegen2-collectors-hv-ves-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/collectors/hv-ves + project-name: 'dcaegen2-collectors-hv-ves' + branch: 'master' + build-node: ubuntu1604-docker-8c-8g + mvn-settings: 'dcaegen2-collectors-hv-ves-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 812b22fcd..4aa9a8c36 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -3,7 +3,6 @@ name: dcaegen2-collectors-restconf project-name: 'dcaegen2-collectors-restconf' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-collectors-restconf-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-collectors-restconf-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/collectors/restconf + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-collectors-restconf' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-restconf-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index f74f6c03c..b0fe67853 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -3,7 +3,6 @@ name: dcaegen2-collectors-snmptrap project-name: 'dcaegen2-collectors-snmptrap' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-collectors-snmptrap-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-collectors-snmptrap-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/collectors/snmptrap + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-collectors-snmptrap' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-snmptrap-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 841395e56..0056c59ea 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -3,7 +3,6 @@ name: dcaegen2-collectors-ves project-name: 'dcaegen2-collectors-ves' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-collectors-ves-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-collectors-ves-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/collectors/ves + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-collectors-ves' + branch: 'master' + mvn-settings: 'dcaegen2-collectors-ves-settings' diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index 6ffa6b44f..648643e4b 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -3,7 +3,6 @@ name: dcaegen2-deployments project-name: 'dcaegen2-deployments' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,13 @@ archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' build-timeout: 180 + +- project: + name: dcaegen2-deployments-clm + jobs: + - gerrit-maven-clm + build-node: ubuntu1604-docker-8c-8g + project: dcaegen2/deployments + project-name: 'dcaegen2-deployments' + branch: 'master' + mvn-settings: 'dcaegen2-deployments-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index d4596635e..c76e65ab4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-blueprints project-name: 'dcaegen2-platform-blueprints' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -21,3 +20,13 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-platform-blueprints-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/blueprints + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-blueprints' + branch: 'master' + mvn-settings: 'dcaegen2-platform-blueprints-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml index c7cf8db9e..180195fb2 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-cdapbroker project-name: 'dcaegen2-platform-cdapbroker' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -21,3 +20,13 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-platform-cdapbroker-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/cdapbroker + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-cdapbroker' + branch: 'master' + mvn-settings: 'dcaegen2-platform-cdapbroker-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml index 089e7b13d..8491afbc8 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-cli project-name: 'dcaegen2-platform-cli' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-platform-cli-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-cli-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/cli + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-cli' + branch: 'master' + mvn-settings: 'dcaegen2-platform-cli-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index c84ce106b..0bd986eee 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-configbinding project-name: 'dcaegen2-platform-configbinding' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-platform-configbinding-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-configbinding-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/configbinding + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-configbinding' + branch: 'master' + mvn-settings: 'dcaegen2-platform-configbinding-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index f5dcd9dae..798fbc520 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-deployment-handler project-name: 'dcaegen2-platform-deployment-handler' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -21,3 +20,13 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-platform-deployment-handler-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/deployment-handler + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-deployment-handler' + branch: 'master' + mvn-settings: 'dcaegen2-platform-deployment-handler-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index bc4855538..0c9582447 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-inventory-api project-name: 'dcaegen2-platform-inventory-api' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -39,3 +38,13 @@ mvn-settings: 'dcaegen2-platform-inventory-api-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-inventory-api-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/inventory-api + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-inventory-api' + branch: 'master' + mvn-settings: 'dcaegen2-platform-inventory-api-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index a68b8c787..007629915 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-plugins project-name: 'dcaegen2-platform-plugins' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-platform-plugins-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-plugins-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/plugins + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-plugins' + branch: 'master' + mvn-settings: 'dcaegen2-platform-plugins-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index 88cfedf76..024d41c4f 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-policy-handler project-name: 'dcaegen2-platform-policy-handler' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-platform-policy-handler-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-platform-policy-handler-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/policy-handler + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-policy-handler' + branch: 'master' + mvn-settings: 'dcaegen2-platform-policy-handler-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 7c66bfdc8..69d8c9527 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -3,7 +3,6 @@ name: dcaegen2-platform-servicechange-handler project-name: 'dcaegen2-platform-servicechange-handler' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -26,3 +25,13 @@ files: '**' archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-platform-servicechange-handler-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/platform/servicechange-handler + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-servicechange-handler' + branch: 'master' + mvn-settings: 'dcaegen2-platform-servicechange-handler-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index 017f6add0..57c0bc79e 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -3,7 +3,6 @@ name: dcaegen2-services-heartbeat project-name: 'dcaegen2-services-heartbeat' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,13 @@ mvn-settings: 'dcaegen2-services-heartbeat-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-heartbeat-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/services/heartbeat + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-services-heartbeat' + branch: 'master' + mvn-settings: 'dcaegen2-services-heartbeat-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index b3e718422..511d93286 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -3,7 +3,6 @@ name: dcaegen2-services-mapper project-name: 'dcaegen2-services-mapper' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -35,3 +34,13 @@ mvn-settings: 'dcaegen2-services-mapper-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-mapper-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/services/mapper + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-services-mapper' + branch: 'master' + mvn-settings: 'dcaegen2-services-mapper-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index d15170137..9fdc9f957 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -3,7 +3,6 @@ name: dcaegen2-services-prh project-name: 'dcaegen2-services-prh' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -31,3 +30,13 @@ mvn-settings: 'dcaegen2-services-prh-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-prh-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/services/prh + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-services-prh' + branch: 'master' + mvn-settings: 'dcaegen2-services-prh-settings' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index f4f22d61c..9b6cb6449 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -5,7 +5,6 @@ python-version: python3 jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -36,3 +35,13 @@ mvn-settings: 'dcaegen2-utils-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-utils-clm + jobs: + - gerrit-maven-clm + project: dcaegen2/utils + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-utils' + branch: 'master' + mvn-settings: 'dcaegen2-utils-settings' diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index 0341dbf94..ce552c073 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -3,7 +3,6 @@ name: dcaegen2 project-name: 'dcaegen2' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,12 @@ deployAtEnd=true files: '**' archive-artifacts: '' + +- project: + name: dcaegen2-clm + jobs: + - gerrit-maven-clm + project: 'dcaegen2' + project-name: 'dcaegen2' + branch: 'master' + mvn-settings: 'dcaegen2-settings' -- cgit 1.2.3-korg