Removing non SSL DR suite

	# Changed trigger job to merge
	# Removed DR maven artifact push
	# Removed old branches from BulkPM suite

Change-Id: I1876a0055b79d68b27f3bb93cdbf70752cc6ba0e
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: DMAAP-1323

diff --git a/jjb/dmaap/dmaap-datarouter-csit.yaml b/jjb/dmaap/dmaap-datarouter-csit.yaml
index 3c51678..9384da6 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter-csit.yaml
+++ b/jjb/dmaap/dmaap-datarouter-csit.yaml
@@ -1,18 +1,4 @@
 ---
-- project:
-    name: dmaap-datarouter-csit
-    jobs:
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dmaap-datarouter'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - 'dr-suite':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-java-shell-daily'
-    robot-options: ''
-
 - project:
     name: dmaap-datarouter-csit-ssl
     jobs:
@@ -24,5 +10,5 @@
     functionality:
       - 'ssl-dr-suite':
           trigger_jobs:
-            - '{project-name}-{stream}-docker-java-shell-daily'
+            - '{project-name}-{stream}-merge-java'
     robot-options: ''

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 2431e2f..3905b02 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -4,10 +4,6 @@
     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
       - gerrit-maven-docker-stage:
           build-node: ubuntu1604-docker-8c-8g
           mvn-goals: 'clean package -P docker docker:build docker:push'

diff --git a/jjb/usecases/5G-bulkpm.yaml b/jjb/usecases/5G-bulkpm.yaml
index ce90c49..53687f1 100644 (file)
--- a/jjb/usecases/5G-bulkpm.yaml
+++ b/jjb/usecases/5G-bulkpm.yaml
@@ -8,12 +8,8 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-      - 'casablanca':
-          branch: 'casablanca'
     functionality:
       - '5G-bulkpm':
           trigger_jobs:
             - '{project-name}-{stream}-docker-java-shell-daily'
-    robot-options: ''
\ No newline at end of file
+    robot-options: ''