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

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index c5e9ab525..cbf4864eb 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -1,41 +1,115 @@
 ---
 - project:
-    name: sdnc-oam
+    name: sdnc-oam-java11
+    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:
+      - "kohn":
+          branch: "kohn"
+    java-version: openjdk11
+    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-released-java17
     project-name: "sdnc-oam"
     jobs:
       - gerrit-maven-verify:
           cron: ""
       - gerrit-maven-merge:
-          cron: "@daily"
           mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          sign-artifacts: false
+          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: ubuntu1804-docker-8c-8g
+          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-current-java17
+    project-name: "sdnc-oam"
+    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"
+          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"
-          java-version: openjdk17
-      - "kohn":
-          branch: "kohn"
-          java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn38"
     mvn-settings: "sdnc-oam-settings"
     files: "**"
     archive-artifacts: ""
-    build-node: ubuntu1804-builder-4c-4g
+    sign-artifacts: true
+    build-node: centos8-docker-8c-8g
     shallow-clone: true
     mvn-snapshot-id: "ecomp-snapshots"
     nexus-snapshot-repo: "snapshots"
@@ -47,7 +121,7 @@
     nexus-iq-namespace: "onap-"
     project: sdnc/oam
     project-name: "sdnc-oam"
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: centos8-docker-8c-8g
     stream:
       - "master":
           branch: "master"
@@ -55,12 +129,3 @@
     java-version: openjdk17
     mvn-version: "mvn38"
     mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
-
-- project:
-    name: sdnc-oam-info
-    project-name: sdnc-oam
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: sdnc/oam
-    branch: master