From 9d56754e8874e4c5a50f95fe5d182c902789e010 Mon Sep 17 00:00:00 2001 From: Vijay Venkatesh Kumar Date: Mon, 24 Feb 2020 20:16:03 +0000 Subject: Fix service repo rls job Change-Id: I99a42426d8a047fa9c5528bd60953f1ec21e2010 Signed-off-by: Vijay Venkatesh Kumar Issue-ID: DCAEGEN2-1891 --- jjb/dcaegen2/dcaegen2-platform.yaml | 2 +- .../dcaegen2-services-bbs-eventprocessor-java.yaml | 3 --- jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml | 3 --- .../dcaegen2-services-pm-subscription-handler.yaml | 17 ----------------- jjb/dcaegen2/dcaegen2-services.yaml | 9 +++++++++ 5 files changed, 10 insertions(+), 24 deletions(-) diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index a77a7c39c..23d22ed77 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -14,6 +14,6 @@ mvn-settings: dcaegen2-platform-settings jobs: - '{project-name}-gerrit-release-jobs' - build-node: centos7-docker-2c-1g + build-node: centos7-docker-8c-8g project: dcaegen2/platform branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml index d2487ddaf..81444df19 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -7,9 +7,6 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java': mvn-goals: 'clean install' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project-name: dcaegen2-services-bbs-event-processor subproject: - 'bbs-event-processor': pom: 'components/bbs-event-processor/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 7bed86576..3b6d678ab 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -6,9 +6,6 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - subproject: - 'datalake-handler': pom: 'components/datalake-handler/pom.xml' diff --git a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml index ce31970ae..38274c713 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-subscription-handler.yaml @@ -53,23 +53,6 @@ - gerrit-tox-sonar: sonar-mvn-goal: '-f components/pm-subscription-handler/pom.xml sonar:sonar' - -- project: - <<: *dcaegen2_services_common - docker-root: components/pm-subscription-handler - name: dcaegen2-services-pmsh-release - project-name: dcaegen2-services-pmsh-release - jobs: - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - stream: - - 'master': - branch: master - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - - project: <<: *dcaegen2_services_common name: dcaegen2-services-pmsh-clm diff --git a/jjb/dcaegen2/dcaegen2-services.yaml b/jjb/dcaegen2/dcaegen2-services.yaml index 81bcd8a0e..4ff813eba 100644 --- a/jjb/dcaegen2/dcaegen2-services.yaml +++ b/jjb/dcaegen2/dcaegen2-services.yaml @@ -7,3 +7,12 @@ build-node: centos7-builder-2c-1g project: dcaegen2/services branch: master +- project: + name: dcaegen2-services-release + project-name: dcaegen2-services + mvn-settings: dcaegen2-services-settings + jobs: + - '{project-name}-gerrit-release-jobs' + build-node: centos7-docker-8c-8g + project: dcaegen2/services + branch: master -- cgit 1.2.3-korg