X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsdnc%2Fsdnc-oam.yaml;h=cbf4864ebb3718699800e09e891437e90c4526df;hb=5f75c6bc29b301ea8f0982387fff23f13dce2e08;hp=e2a3f1f15ad6ad51c44932d65c466e0ece569e8c;hpb=1b4b84e1df911dc8e4aea9b3c3c0a93f0bb71091;p=ci-management.git

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index e2a3f1f15..cbf4864eb 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -1,84 +1,131 @@
 ---
 - project:
-    name: sdnc-oam
-    project-name: 'sdnc-oam'
+    name: sdnc-oam-java11
+    project-name: "sdnc-oam"
     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: ''
-          sbom-generator: false
+          mvn-params: "-Dmaven.test.skip=true"
+          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 -Ddocker.skip.run=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 -Ddocker.skip.run=true -Pdocker"
           maven-versions-plugin: true
-          cron: '@daily'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'sdnc/oam'
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "sdnc/oam"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
+      - "kohn":
+          branch: "kohn"
     java-version: openjdk11
     mvn-version: "mvn38"
-    mvn-settings: 'sdnc-oam-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+    mvn-settings: "sdnc-oam-settings"
+    files: "**"
+    archive-artifacts: ""
+    sign-artifacts: true
+    build-node: centos8-docker-8c-8g
     shallow-clone: true
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
-#
-#- project:
-#    name: sdnc-oam-docker-arm64
-#    project-name: 'sdnc-oam-arm64'
-#    jobs:
-#      - 'docker-version-java-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: 'sdnc/oam'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'sdnc-oam-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
+- project:
+    name: sdnc-oam-released-java17
+    project-name: "sdnc-oam"
+    jobs:
+      - 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
+      - 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: "sdnc/oam"
+    stream:
+      - "montreal":
+          branch: "montreal"
+      - "london":
+          branch: "london"
+    java-version: openjdk17
+    mvn-version: "mvn38"
+    mvn-settings: "sdnc-oam-settings"
+    files: "**"
+    archive-artifacts: ""
+    sign-artifacts: true
+    build-node: centos8-docker-8c-8g
+    shallow-clone: true
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
-    name: sdnc-oam-clm
+    name: sdnc-oam-current-java17
+    project-name: "sdnc-oam"
     jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: sdnc/oam
-    project-name: 'sdnc-oam'
-    build-node: ubuntu1804-builder-4c-4g
+      - 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
+      - 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: "sdnc/oam"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'sdnc-oam-settings'
-    java-version: openjdk11
-    mvn-version: 'mvn38'
+      - "master":
+          branch: "master"
+    java-version: openjdk17
+    mvn-version: "mvn38"
+    mvn-settings: "sdnc-oam-settings"
+    files: "**"
+    archive-artifacts: ""
+    sign-artifacts: true
+    build-node: centos8-docker-8c-8g
+    shallow-clone: true
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
 
 - project:
-    name: sdnc-oam-info
-    project-name: sdnc-oam
+    name: sdnc-oam-clm
     jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
     project: sdnc/oam
-    branch: master
+    project-name: "sdnc-oam"
+    build-node: centos8-docker-8c-8g
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "sdnc-oam-settings"
+    java-version: openjdk17
+    mvn-version: "mvn38"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"