X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fccsdk%2Fccsdk-oran.yaml;h=4f949f456d9b29dd423f4b9a6ce08964dfd77a54;hb=5f75c6bc29b301ea8f0982387fff23f13dce2e08;hp=0f9b104abb486a8cf6dca0359ccc2e9f505c0d16;hpb=75019e1df42662d799154f4b10fa982cd564d74d;p=ci-management.git

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 0f9b104ab..4f949f456 100644
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -1,93 +1,155 @@
 ---
 - project:
-    name: ccsdk-oran
-    project-name: 'ccsdk-oran'
+    name: ccsdk-oran-java11
+    project-name: "ccsdk-oran"
     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'
-          mvn-opts: '-Ddocker.skip=true'
-          cron: ''
+          mvn-params: "-Dmaven.test.skip=true"
+          mvn-opts: "-Ddocker.skip=true"
+          cron: ""
           sbom-generator: true
       - gerrit-maven-docker-stage:
-          build-node: centos7-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: 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-8c-8g
-    project: 'ccsdk/oran'
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "ccsdk/oran"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-oran-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-oran-settings"
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
     mvn-profile: docker
-    build-node: centos7-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-oran-clm
+    name: ccsdk-oran-released-java17
+    project-name: "ccsdk-oran"
     jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/oran'
-    project-name: 'ccsdk-oran'
+      - 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"
+          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
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "ccsdk/oran"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-    java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-oran-settings'
-    mvn-opts: '-Ddocker.skip=true'
-    build-node: centos8-builder-4c-4g
+      - "montreal":
+          branch: "montreal"
+      - "london":
+          branch: "london"
+    java-version: openjdk17
+    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-current-java17
+    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: "@daily"
+          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
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "ccsdk/oran"
+    stream:
+      - "master":
+          branch: "master"
+    java-version: openjdk17
+    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-info
-    project: ccsdk/oran
-    project-name: ccsdk-oran
-    build-node: centos8-builder-2c-1g
+    name: ccsdk-oran-clm
     jobs:
-      - gerrit-info-yaml-verify
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: "ccsdk/oran"
+    project-name: "ccsdk-oran"
+    stream:
+      - "master":
+          branch: "master"
+    java-version: openjdk17
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-oran-settings"
+    mvn-opts: "-Ddocker.skip=true --add-opens=java.base/java.util=ALL-UNNAMED"
+    build-node: centos8-builder-4c-4g
 
 - project:
     name: ccsdk-oran-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: centos7-docker-8c-8g
-    project: 'ccsdk/oran'
-    project-name: 'ccsdk-oran'
-    branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn38'
-    mvn-settings: 'ccsdk-oran-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}"
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "a1-policy-management/.*"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: centos8-docker-8c-8g
+    project: "ccsdk/oran"
+    project-name: "ccsdk-oran"
+    branch: "master"
+    java-version: openjdk17
+    mvn-version: "mvn38"
+    mvn-settings: "ccsdk-oran-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -Ddocker.skip=true"
+    mvn-params: "-f a1-policy-management"