Separate java 11 and 17 streams

Separate streams based on java 11 and java 17 to separate projects, since
setting java-version per stream is not working at the moment.

Issue-ID: CIMAN-436
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: If4e3c38a8fc5902c5d33ed87ae46ad01449ac944

8 files changed, 308 insertions, 46 deletions

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 3b1bde37c..894ed22cc 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -6,7 +6,7 @@
       - project-view
 
 - project:
-    name: ccsdk-apps
+    name: ccsdk-apps-java11
     project-name: "ccsdk-apps"
     jobs:
       - gerrit-maven-verify:
@@ -32,15 +32,54 @@
 
     project: "ccsdk/apps"
     stream:
+      - "kohn":
+          branch: "kohn"
+    java-version: openjdk11
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-apps-settings"
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+
+- project:
+    name: ccsdk-apps
+    project-name: "ccsdk-apps-java17"
+    jobs:
+      - gerrit-maven-verify:
+          mvn-params: "-Ddocker.skip.push=true -Pdocker"
+      - gerrit-maven-merge:
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-stage:
+          build-node: centos8-docker-8c-8g
+          sign-artifacts: true
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
+          sbom-generator: true
+
+      - gerrit-maven-docker-stage:
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -Pdocker"
+          maven-versions-plugin: true
+          cron: "@daily"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+
+    project: "ccsdk/apps"
+    stream:
       - "master":
           branch: "master"
-          java-version: openjdk17
       - "london":
           branch: "london"
-          java-version: openjdk17
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-apps-settings"
     # due to a strange macro / variable translation problem this needs to be
diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml
index 67d1b9dd3..12657cf9a 100644
--- a/jjb/ccsdk/ccsdk-csit.yaml
+++ b/jjb/ccsdk/ccsdk-csit.yaml
@@ -25,7 +25,27 @@
     branch: "master"
 
 - project:
-    name: ccsdk-oran-csit
+    name: ccsdk-oran-csit-java11
+    jobs:
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
+      - "{project-name}-merge-verification-maven-{stream}":
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
+    project-name: "ccsdk-oran"
+    recipients: "bjorn.magnusson@est.tech martin.c.yan@est.tech"
+    # project name in gerrit
+    project: "ccsdk/oran"
+    stream:
+      - "kohn":
+          branch: "kohn"
+    java-version: openjdk11
+    mvn-settings: "ccsdk-oran-settings"
+    mvn-version: "mvn38"
+    robot-options: ""
+    branch: "master"
+
+- project:
+    name: ccsdk-oran-csit-java17
     jobs:
       - "{project-name}-review-verification-maven-{stream}":
           mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker"
@@ -37,14 +57,10 @@
     project: "ccsdk/oran"
     stream:
       - "master":
-          java-version: openjdk17
           branch: "master"
       - "london":
-          java-version: openjdk17
           branch: "london"
-      - "kohn":
-          java-version: openjdk11
-          branch: "kohn"
+    java-version: openjdk17
     mvn-settings: "ccsdk-oran-settings"
     mvn-version: "mvn38"
     robot-options: ""
diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 94523ede4..275123e4e 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -1,6 +1,46 @@
 ---
 - project:
-    name: ccsdk-oran
+    name: ccsdk-oran-java11
+    project-name: "ccsdk-oran"
+    jobs:
+      - gerrit-maven-verify:
+          cron: ""
+      - gerrit-maven-merge:
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-stage:
+          build-node: centos8-docker-8c-8g
+          sign-artifacts: true
+          mvn-params: "-Dmaven.test.skip=true"
+          mvn-opts: "-Ddocker.skip=true"
+          cron: ""
+          sbom-generator: true
+      - gerrit-maven-docker-stage:
+          build-node: centos8-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -Pdocker"
+          maven-versions-plugin: true
+          cron: "@daily"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "ccsdk/oran"
+    stream:
+      - "kohn":
+          branch: "kohn"
+    java-version: openjdk11
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-oran-settings"
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
+    mvn-profile: docker
+    build-node: centos8-docker-8c-8g
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+
+- project:
+    name: ccsdk-oran-java17
     project-name: "ccsdk-oran"
     jobs:
       - gerrit-maven-verify:
@@ -28,13 +68,9 @@
     stream:
       - "master":
           branch: "master"
-          java-version: openjdk17
       - "london":
           branch: "london"
-          java-version: openjdk17
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-oran-settings"
     files: "**"
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 9ab11c530..700b9bdf6 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -1,5 +1,47 @@
 ---
 - project:
+    name: ccsdk-cds-java11
+    project-name: "ccsdk-cds"
+    jobs:
+      - gerrit-maven-verify:
+          mvn-params: "-Ddocker.skip.push=true -Pdocker"
+      - gerrit-maven-merge:
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-stage:
+          build-node: centos8-docker-8c-8g
+          sign-artifacts: true
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
+          sbom-generator: true
+      - gerrit-maven-docker-stage:
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -Pdocker"
+          maven-versions-plugin: true
+          cron: "@daily"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+
+    project: "ccsdk/cds"
+    stream:
+      - "kohn":
+          branch: "kohn"
+    java-version: openjdk11
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-cds-settings"
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+
+- project:
     name: ccsdk-cds-java17
     project-name: "ccsdk-cds"
     jobs:
@@ -27,13 +69,9 @@
     stream:
       - "master":
           branch: "master"
-          java-version: openjdk17
       - "london":
           branch: "london"
-          java-version: openjdk17
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-cds-settings"
     # due to a strange macro / variable translation problem this needs to be
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index e68246104..f2c92eb86 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -1,6 +1,47 @@
 ---
 - project:
-    name: ccsdk-distribution
+    name: ccsdk-distribution-java11
+    project-name: "ccsdk-distribution"
+    jobs:
+      - gerrit-maven-verify:
+          cron: ""
+      - gerrit-maven-merge:
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-stage:
+          build-node: centos8-docker-8c-8g
+          sign-artifacts: true
+          mvn-params: "-Dmaven.test.skip=true"
+          maven-versions-plugin: true
+          cron: ""
+          sbom-generator: true
+      - gerrit-maven-docker-stage:
+          build-node: centos8-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker"
+          maven-versions-plugin: true
+          cron: "@daily"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+
+    project: "ccsdk/distribution"
+    stream:
+      - "kohn":
+          branch: "kohn"
+    java-version: openjdk11
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-distribution-settings"
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
+    mvn-profile: docker
+    build-node: centos8-docker-8c-8g
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+
+- project:
+    name: ccsdk-distribution-java17
     project-name: "ccsdk-distribution"
     jobs:
       - gerrit-maven-verify:
@@ -33,9 +74,6 @@
       - "london":
           branch: "london"
           java-version: openjdk17
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-distribution-settings"
     files: "**"
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index efa5cd065..72a6410f2 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -1,6 +1,43 @@
 ---
 - project:
-    name: ccsdk-features
+    name: ccsdk-features-java11
+    project-name: "ccsdk-features"
+    jobs:
+      - gerrit-maven-verify:
+          cron: ""
+      - gerrit-maven-merge:
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-stage:
+          build-node: centos8-docker-8c-8g
+          sign-artifacts: true
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
+          sbom-generator: true
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+
+    project: "ccsdk/features"
+    stream:
+      - "kohn":
+          branch: "kohn"
+          mvn-opts: "-Xmx3072m -XX:MaxPermSize=1024m"
+    java-version: openjdk11
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-features-settings"
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-builder-4c-4g
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+
+- project:
+    name: ccsdk-features-java17
     project-name: "ccsdk-features"
     jobs:
       - gerrit-maven-verify:
@@ -21,16 +58,11 @@
     stream:
       - "master":
           branch: "master"
-          java-version: openjdk17
           mvn-opts: "-Xmx3072m"
       - "london":
           branch: "london"
-          java-version: openjdk17
           mvn-opts: "-Xmx3072m"
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
-          mvn-opts: "-Xmx3072m -XX:MaxPermSize=1024m"
+    java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-features-settings"
     # due to a strange macro / variable translation problem this needs to be
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 991b87c63..2222358fe 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -1,6 +1,41 @@
 ---
 - project:
-    name: ccsdk-parent
+    name: ccsdk-parent-java11
+    project-name: "ccsdk-parent"
+    jobs:
+      - gerrit-maven-verify:
+          cron: ""
+      - gerrit-maven-merge:
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-stage:
+          build-node: centos8-docker-8c-8g
+          sign-artifacts: true
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
+          sbom-generator: true
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    project: "ccsdk/parent"
+    stream:
+      - "kohn":
+          branch: "kohn"
+    java-version: openjdk11
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-parent-settings"
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+
+- project:
+    name: ccsdk-parent-java17
     project-name: "ccsdk-parent"
     jobs:
       - gerrit-maven-verify:
@@ -23,7 +58,6 @@
     stream:
       - "master":
           branch: "master"
-          java-version: openjdk17
           jobs:
             - gerrit-maven-verify:
                 mvn-params: "-Drevision=3.0.0-SNAPSHOT"
@@ -35,10 +69,7 @@
                 mvn-params: "-Drevision=3.0.0"
       - "london":
           branch: "london"
-          java-version: openjdk17
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-parent-settings"
     # due to a strange macro / variable translation problem this needs to be
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml
index a9579405a..0b49fda01 100644
--- a/jjb/ccsdk/sli.yaml
+++ b/jjb/ccsdk/sli.yaml
@@ -1,6 +1,42 @@
 ---
 - project:
-    name: ccsdk-sli
+    name: ccsdk-sli-java11
+    project-name: "ccsdk-sli"
+    jobs:
+      - gerrit-maven-verify:
+          cron: ""
+      - gerrit-maven-merge:
+          cron: "@daily"
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-stage:
+          build-node: centos8-docker-8c-8g
+          sign-artifacts: true
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
+          sbom-generator: true
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+
+    project: "ccsdk/sli"
+    stream:
+      - "kohn":
+          branch: "kohn"
+    java-version: openjdk11
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-sli-settings"
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-builder-4c-4g
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+
+- project:
+    name: ccsdk-sli-java17
     project-name: "ccsdk-sli"
     jobs:
       - gerrit-maven-verify:
@@ -21,13 +57,9 @@
     stream:
       - "master":
           branch: "master"
-          java-version: openjdk17
       - "london":
           branch: "london"
-          java-version: openjdk17
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "ccsdk-sli-settings"
     # due to a strange macro / variable translation problem this needs to be