X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Ffeatures.yaml;h=3847cecdf8458d005593f04e1d3a5ed410ea2a48;hb=5f75c6bc29b301ea8f0982387fff23f13dce2e08;hp=ba34b88d66c983ae41dbdf80325f631f66d9eba6;hpb=73681ac17675a8d94a7f10a78f26f5c10a88552d;p=ci-management.git

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index ba34b88d6..3847cecdf 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -1,100 +1,146 @@
 ---
 - project:
-    name: ccsdk-features
-    project-name: 'ccsdk-features'
+    name: ccsdk-features-java11
+    project-name: "ccsdk-features"
     jobs:
       - gerrit-maven-verify:
-          cron: ''
+          cron: ""
       - gerrit-maven-merge:
-          cron: '@daily'
-          mvn-params: '-Dmaven.test.skip=true'
+          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'
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
+          sbom-generator: true
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-    project: 'ccsdk/features'
+    project: "ccsdk/features"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
+      - "kohn":
+          branch: "kohn"
+          mvn-opts: "-Xmx3072m -XX:MaxPermSize=1024m"
     java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-features-settings'
+    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: ''
-    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    build-node: centos7-builder-4c-4g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-builder-4c-4g
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
-    name: ccsdk-features-sonar
+    name: ccsdk-features-released-java17
+    project-name: "ccsdk-features"
     jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: centos7-builder-4c-4g
-    project: 'ccsdk/features'
-    project-name: 'ccsdk-features'
-    branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-features-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+      - 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"
+          cron: ""
+          sbom-generator: true
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+
+    project: "ccsdk/features"
+    stream:
+      - "montreal":
+          branch: "montreal"
+          mvn-opts: "-Xmx3072m"
+      - "london":
+          branch: "london"
+          mvn-opts: "-Xmx3072m"
+    java-version: openjdk17
+    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-clm
+    name: ccsdk-features-current-java17
+    project-name: "ccsdk-features"
     jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/features'
-    project-name: 'ccsdk-features'
+      - 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:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-features-settings'
-    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    build-node: centos7-builder-4c-4g
+      - "master":
+          branch: "master"
+          mvn-opts: "-Xmx3072m"
+    java-version: openjdk17
+    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-info
-    project-name: ccsdk-features
+    name: ccsdk-features-sonar
     jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/features
-    branch: master
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: centos8-builder-4c-4g
+    project: "ccsdk/features"
+    project-name: "ccsdk-features"
+    branch: "master"
+    java-version: openjdk17
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-features-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx3072m"
 
 - project:
-    name: ccsdk-features-whitesource
-    build-node: centos7-builder-4c-4g
-    project-name: ccsdk-features
+    name: ccsdk-features-clm
     jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-features-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    project: ccsdk/features
-    branch: master
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: "ccsdk/features"
+    project-name: "ccsdk-features"
+    stream:
+      - "master":
+          branch: "master"
+    java-version: openjdk17
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-features-settings"
+    mvn-opts: "-Xmx3072m --add-opens=java.base/java.util=ALL-UNNAMED"
+    build-node: centos8-builder-4c-4g