X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdnc%2Fsdnc-apps.yaml;h=03380e9a453751d7fec82728720537d64b906fbe;hb=5f75c6bc29b301ea8f0982387fff23f13dce2e08;hp=135973e0558ecc1ece797f4aa83e2eaafd1a5a80;hpb=2d00d92ef852fb42d18f374cbb1fdbd8b4707864;p=ci-management.git

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 135973e05..03380e9a4 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -6,120 +6,134 @@
       - project-view
 
 - project:
-    name: sdnc-apps
-    project-name: 'sdnc-apps'
+    name: sdnc-apps-java11
+    project-name: "sdnc-apps"
     jobs:
       - gerrit-maven-verify:
-          build-node: ubuntu2004-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Ddocker.skip.push=true -Pdocker'
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Ddocker.skip.push=true -Pdocker"
       - 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: ''
+          mvn-params: "-Dmaven.test.skip=true"
+          cron: ""
           sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu2004-docker-8c-8g
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -Pdocker'
+          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 -Pdocker"
           maven-versions-plugin: true
-          cron: '@daily'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-    project: 'sdnc/apps'
+    project: "sdnc/apps"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
+      - "montreal":
+          branch: "montreal"
+      - "london":
+          branch: "london"
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
-    mvn-version : "mvn38"
-    mvn-settings: 'sdnc-apps-settings'
+    mvn-version: "mvn38"
+    mvn-settings: "sdnc-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: ''
+    files: "**"
+    archive-artifacts: ""
     maven-version: "mvn38"
-    build-node: ubuntu2004-builder-4c-4g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+
+- project:
+    name: sdnc-apps-java17
+    project-name: "sdnc-apps"
+    jobs:
+      - gerrit-maven-verify:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          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:
+          cron: "@daily"
+          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 -Pdocker"
+          maven-versions-plugin: true
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+
+    project: "sdnc/apps"
+    stream:
+      - "master":
+          branch: "master"
+    java-version: openjdk17
+    mvn-version: "mvn38"
+    mvn-settings: "sdnc-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: ""
+    maven-version: "mvn38"
+    build-node: ubuntu1804-builder-4c-4g
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
     name: sdnc-apps-sonar
     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: ubuntu2004-builder-4c-4g
-    project: 'sdnc/apps'
-    project-name: 'sdnc-apps'
-    branch: 'master'
-    java-version: openjdk11
-    mvn-version : "mvn38"
-    mvn-settings: 'sdnc-apps-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: ubuntu1804-builder-4c-4g
+    project: "sdnc/apps"
+    project-name: "sdnc-apps"
+    branch: "master"
+    java-version: openjdk17
+    mvn-version: "mvn38"
+    mvn-settings: "sdnc-apps-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m"
     maven-version: "mvn38"
 
-#
-#- project:
-#    name: sdnc-apps-docker-arm64
-#    project-name: 'sdnc-apps-arm64'
-#    jobs:
-#      - 'docker-version-java-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: 'sdnc/apps'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdnc-apps-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu2004-docker-arm64-4c-2g
-
 - project:
     name: sdnc-apps-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: sdnc/apps
-    project-name: 'sdnc-apps'
-    build-node: ubuntu2004-builder-4c-4g
+    project-name: "sdnc-apps"
+    build-node: ubuntu1804-builder-4c-4g
     stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-    java-version: openjdk11
-    mvn-version : "mvn38"
-    mvn-settings: 'sdnc-apps-settings'
-
-- project:
-    name: sdnc-apps-info
-    project-name: sdnc-apps
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: sdnc/apps
-    branch: master
+      - "master":
+          branch: "master"
+    java-version: openjdk17
+    mvn-version: "mvn38"
+    mvn-settings: "sdnc-apps-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"