X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Fdistribution.yaml;h=478e61d9917b486eafa9a37d140a42b7c15bda8f;hb=5f75c6bc29b301ea8f0982387fff23f13dce2e08;hp=f962c14732d58f42613e0b15b7ec2467d9db28a6;hpb=f4f78ae24e975e7eb9f5f884b5324f37d59a6b30;p=ci-management.git

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index f962c1473..478e61d99 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -1,108 +1,138 @@
 ---
 - project:
-    name: ccsdk-distribution
-    project-name: 'ccsdk-distribution'
+    name: ccsdk-distribution-java11
+    project-name: "ccsdk-distribution"
     jobs:
-      - gerrit-maven-verify
+      - gerrit-maven-verify:
+          cron: ""
       - gerrit-maven-merge:
-          cron: '@daily'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           sign-artifacts: true
+          mvn-params: "-Dmaven.test.skip=true"
           maven-versions-plugin: true
-          cron: ''
+          cron: ""
+          sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
+          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-8c-8g
-      - gerrit-maven-docker-snapshot:
-          build-node: ubuntu1804-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-snapshot-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker'
-          maven-versions-plugin: true
-      - '{project-name}-{stream}-docker-staging':
-          script:
-            !include-raw-escape: 'tag-ccsdk-distribution-images-staging.sh'
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-    project: 'ccsdk/distribution'
+    project: "ccsdk/distribution"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-distribution-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-distribution-settings"
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
     mvn-profile: docker
-    build-node: ubuntu1804-docker-8c-8g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-
+    build-node: centos8-docker-8c-8g
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
-#- project:
-#    name: ccsdk-distribution-arm64-docker
-#    project-name: 'ccsdk-distribution-arm64'
-#    jobs:
-#      - 'docker-version-java-daily':
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: 'ccsdk/distribution'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'ccsdk-distribution-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    docker-pom: 'pom.xml'
-#    mvn-profile: docker
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#
 - project:
-    name: ccsdk-distribution-clm
+    name: ccsdk-distribution-released-java17
+    project-name: "ccsdk-distribution"
     jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/distribution'
-    project-name: 'ccsdk-distribution'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-distribution-settings'
-    build-node: ubuntu1804-docker-8c-8g
+      - gerrit-maven-verify:
+          cron: ""
+      - gerrit-maven-merge:
+          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
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
+    project: "ccsdk/distribution"
+    stream:
+      - "montreal":
+          branch: "montreal"
+          java-version: openjdk17
+      - "london":
+          branch: "london"
+          java-version: openjdk17
+    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-info
-    project-name: ccsdk-distribution
+    name: ccsdk-distribution-current-java17
+    project-name: "ccsdk-distribution"
     jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/distribution
-    branch: master
+      - 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:
+          cron: "@daily"
+          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
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+
+    project: "ccsdk/distribution"
+    stream:
+      - "master":
+          branch: "master"
+          java-version: openjdk17
+    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-whitesource
-    project-name: ccsdk-distribution
-    build-node: ubuntu1804-builder-4c-4g
+    name: ccsdk-distribution-clm
     jobs:
-      - gerrit-whitesource-scan:
-          java-opts: '-Xmx2048m'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-distribution-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/distribution
-    branch: master
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: "ccsdk/distribution"
+    project-name: "ccsdk-distribution"
+    stream:
+      - "master":
+          branch: "master"
+    java-version: openjdk17
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-distribution-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
+    build-node: centos8-docker-8c-8g