dcaegen2-platform fix extra release jobs

Signed-off-by: Andrew Gauld <agauld@att.com>
Issue-ID: DCAEGEN2-1861
Change-Id: I62f3dd461ba3ed1debdbbb1a66977146251faf62

diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
index 847f052..5d8b996 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml
@@ -61,8 +61,6 @@
           cron: '@daily'
           stream: master
           branch: master
-      - gerrit-release-verify
-      - gerrit-release-merge
 
 - project:
     name: dcaegen2-platform-docker-python-subprojects

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
index 1c29e04..855be90 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.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
-          project-name: dcaegen2-platform-mod-bpgenerator
       - gerrit-maven-stage:
           project-name: dcaegen2-platform-mod-bpgenerator
           sign-artifacts: true

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
index 4cced95..2402dd0 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml
@@ -8,9 +8,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-platform-mod-designtool
     subproject:
       - designtool:
           pom: 'mod/designtool/pom.xml'

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
index 513df2f..f3ad499 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -8,9 +8,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-platform-mod-genprocessor
     subproject:
       - genprocessor:
           pom: 'mod/genprocessor/pom.xml'

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
index ed11903..cdfd3c6 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
@@ -8,9 +8,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-platform-mod-runtimeapi
     subproject:
       - runtimeapi:
           pom: 'mod/runtimeapi/pom.xml'

diff --git a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
index e5825be..c38e1c8 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-oti-eventproc.yaml
@@ -8,10 +8,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-platform-oti-event-proc
-
     subproject:
       - eventproc:
           pom: 'oti/event-proc/pom.xml'

diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml
index fa8af0d..a77a7c3 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform.yaml
@@ -7,3 +7,13 @@
     build-node: centos7-builder-2c-1g
     project: dcaegen2/platform
     branch: master
+
+- project:
+    name: dcaegen2-platform-release
+    project-name: dcaegen2-platform
+    mvn-settings: dcaegen2-platform-settings
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+    build-node: centos7-docker-2c-1g
+    project: dcaegen2/platform
+    branch: master