Merge "Rollback jobs to jdk 11"

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
new file mode 100644 (file)
index 0000000..e476fbf
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml
@@ -0,0 +1,33 @@
+---
+- project:
+    name: dcaegen2-platform-mod-genprocessor
+    project-name: dcaegen2-platform-mod
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - genprocessor:
+          pom: 'mod/genprocessor/pom.xml'
+          pattern: 'mod/genprocessor/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod-genprocessor-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1604-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-mod-genprocessor-clm
+    mvn-params: '-f mod/genprocessor/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
new file mode 100644 (file)
index 0000000..bd7679c
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml
@@ -0,0 +1,33 @@
+---
+- project:
+    name: dcaegen2-platform-mod-runtimeapi
+    project-name: dcaegen2-platform-mod
+    # git repo
+    project: dcaegen2/platform
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java':
+          mvn-goals: 'clean install'
+    subproject:
+      - runtimeapi:
+          pom: 'mod/runtimeapi/pom.xml'
+          pattern: 'mod/runtimeapi/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: dcaegen2-platform-settings
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-docker-8c-8g
+
+- project:
+    name: dcaegen2-platform-mod-runtimeapi-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    build-node: ubuntu1604-docker-8c-8g
+    project: 'dcaegen2/platform'
+    project-name: dcaegen2-platform-mod-runtimeapi-clm
+    mvn-params: '-f mod/runtimeapi/pom.xml'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-platform-settings'

diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 0a2ffe5..0da5dd2 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -24,6 +24,20 @@
     maven-deploy-properties: |
       deployAtEnd=true
 
+- project:
+    name: dcaegen2-services-sdk-integration-pairwise
+    jobs:
+      - '{project-name}-{stream}-integration-pairwise'
+    build-node: ubuntu1604-docker-8c-8g
+    project: 'dcaegen2/services/sdk'
+    project-name: 'dcaegen2-services-sdk'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'dcaegen2-services-sdk-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: ' -P integration-pairwise'
+
 - project:
     name: dcaegen2-services-sdk-sonar
     jobs:

diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 2fe4ee7..3bad3bc 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -9,7 +9,8 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dmaap/messagerouter/dmaapclient'
     stream:
       - 'master':

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 7640b54..bcf4bd3 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -115,6 +115,25 @@
     <<: *verify_java_defaults
     name: '{project-name}-{stream}-{subproject}-verify-java'
 
+- job-template:
+    # Job template for Java integration pairwise jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean install
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    <<: *verify_java_defaults
+    name: '{project-name}-{stream}-integration-pairwise'
+    triggers:
+      - timed: '@daily'
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{obj:pattern}'
+
 - job-template:
     # Job template for Java daily release jobs
     #

diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml
index 77e34e6..b3670e2 100644 (file)
--- a/jjb/sdc/sdc-sdc-be-common.yaml
+++ b/jjb/sdc/sdc-sdc-be-common.yaml
@@ -19,6 +19,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'sdc-sdc-be-common-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 3a258e5..c66789a 100644 (file)
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -26,6 +26,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''