Merge "[DMAAP-MR] - Uplift jjb to Java 11 for Dmaap msgrtr and messageService"

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 04306f3..cecfb79 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -38,7 +38,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
-          mvn-params: "-P cps-xnf-docker"
+          mvn-params: "-P cps-ncmp-docker"
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
@@ -46,7 +46,7 @@
       - gerrit-maven-docker-stage:
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P cps-xnf-docker'
+          mvn-params: '-P cps-ncmp-docker'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':

diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml
index 35f5061..7da843a 100644 (file)
--- a/jjb/dmaap/dmaap-buscontroller-csit.yaml
+++ b/jjb/dmaap/dmaap-buscontroller-csit.yaml
@@ -10,9 +10,6 @@
       - 'master':
           branch: 'master'
     functionality:
-      - 'ssl':
-          trigger_jobs:
-            - '{project-name}-maven-docker-stage-{stream}'
       - 'with_mr':
           trigger_jobs:
             - '{project-name}-maven-docker-stage-{stream}'

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 8c77747..de41a48 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -17,6 +17,25 @@
     stream:
       - 'master':
           branch: 'master'
+    mvn-settings: 'dmaap-datarouter-settings'
+    files: '**'
+    archive-artifacts: ''
+    java-version: openjdk11
+
+- project:
+    name: dmaap-datarouter-maintenance-java11
+    project-name: 'dmaap-datarouter-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-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/datarouter'
+    stream:
       - 'honolulu':
           branch: 'honolulu'
       - 'guilin':
@@ -25,7 +44,7 @@
     files: '**'
     archive-artifacts: ''
     java-version: openjdk11
-
+    cron: ''
 
 - project:
     name: dmaap-datarouter-sonar

diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
index 6d2c882..5ac5d8d 100644 (file)
--- a/jjb/integration/xtesting/integration-xtesting.yaml
+++ b/jjb/integration/xtesting/integration-xtesting.yaml
@@ -43,6 +43,8 @@
                 branch: 'frankfurt'
           - 'guilin':
                 branch: 'guilin'
+          - 'honolulu':
+                branch: 'honolulu'
 
 - project:
     name: integration-xtesting-release
@@ -111,6 +113,9 @@
       - 'master':
             branch: 'master'
             files: ''
+      - 'honolulu':
+            branch: 'honolulu'
+            files: ''
       - 'guilin':
             branch: 'guilin'
             files: ''

diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
index dd41c92..5a723e4 100644 (file)
--- a/jjb/optf/optf-has-csit.yaml
+++ b/jjb/optf/optf-has-csit.yaml
@@ -1,14 +1,17 @@
 - project:
     name: optf-has-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
+      - '{project-name}-review-verification-maven-{stream}':
+          mvn-goals: clean install
+      - '{project-name}-merge-verification-maven-{stream}':
+          mvn-goals: clean install
     project-name: optf-has
     recipients: 'snarayanan@research.att.com'
+    project: optf/has
     stream:
       - 'master':
           branch: 'master'
-    functionality:
-      - 'has':
-          trigger_jobs:
+      - 'honolulu':
+          branch: 'honolulu'
+    mvn-settings: 'optf-has-settings'
     robot-options: ''

diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml
index e142b23..9398122 100644 (file)
--- a/jjb/optf/optf-osdf-csit.yaml
+++ b/jjb/optf/optf-osdf-csit.yaml
@@ -1,14 +1,17 @@
 - project:
     name: optf-osdf-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
+      - '{project-name}-review-verification-maven-{stream}':
+          mvn-goals: clean install
+      - '{project-name}-merge-verification-maven-{stream}':
+          mvn-goals: clean install
     project-name: optf-osdf
     recipients: 'snarayanan@research.att.com'
+    project: optf/osdf
     stream:
       - 'master':
           branch: 'master'
-    functionality:
-      - 'osdf':
-          trigger_jobs:
+      - 'honolulu':
+          branch: 'honolulu'
+    mvn-settings: 'optf-osdf-settings'
     robot-options: ''

diff --git a/jjb/usecases/usecases-csit.yaml b/jjb/usecases/usecases-csit.yaml
index 8e70983..23cb189 100644 (file)
--- a/jjb/usecases/usecases-csit.yaml
+++ b/jjb/usecases/usecases-csit.yaml
@@ -1,20 +1,4 @@
 ---
-- project:
-    name: usecases-5G-bulkpm-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'usecases-5G-bulkpm'
-    recipients: 'morgan.richomm@orange.com bf1936@att.com lego@est.tech'
-    stream:
-      - 'master':
-          branch: 'master'
-    functionality:
-      - '5G-bulkpm':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-java-shell-daily'
-    robot-options: ''
-
 - project:
     name: usecases-pnf-sw-upgrade
     jobs: