From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Mon, 24 Jul 2023 18:05:27 +0000 (+0000)
Subject: Merge "Migrate DMI Plugin jobs to Java 17"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ad57e2fc02bf0b3a0170d3817581fdbc469f893b;hp=cc59bde2c42dd6cc3b6d296c50efd93aee9f1086;p=ci-management.git

Merge "Migrate DMI Plugin jobs to Java 17"
---

diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index 908f86531..ee12b056b 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -14,8 +14,8 @@
       - gerrit-info-yaml-verify
 
 - project:
-    name: cps-ncmp-dmi-plugin
-    java-version: openjdk11
+    name: cps-ncmp-dmi-plugin-java17
+    java-version: openjdk17
     mvn-version: mvn36
     maven-version: mvn36
     project-name: cps-ncmp-dmi-plugin
@@ -42,15 +42,44 @@
     stream:
       - "master":
           branch: master
-      - "jakarta":
-          branch: "jakarta"
+      - "london":
+          branch: "london"
           cron: ""
+    mvn-settings: cps-ncmp-dmi-plugin-settings
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
+
+- project:
+    name: cps-ncmp-dmi-plugin-java11
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    project-name: cps-ncmp-dmi-plugin
+    project: cps/ncmp-dmi-plugin
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    jobs:
+      - gerrit-maven-docker-verify:
+          container-public-registry: nexus3.onap.org:10001
+      - gerrit-maven-merge
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          sbom-generator: true
+      - gerrit-maven-docker-stage:
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: -Pdocker
+          container-public-registry: nexus3.onap.org:10001
+          container-staging-registry: nexus3.onap.org:10003
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
       - "kohn":
           branch: "kohn"
           cron: ""
-      - "london":
-          branch: "london"
-          cron: ""
     mvn-settings: cps-ncmp-dmi-plugin-settings
     files: "**"
     archive-artifacts: ""
@@ -58,7 +87,7 @@
 
 - project:
     name: cps-ncmp-dmi-plugin-clm
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: mvn36
     maven-version: mvn36
     jobs:
@@ -72,7 +101,7 @@
 
 - project:
     name: cps-ncmp-dmi-plugin-sonar
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: mvn36
     maven-version: mvn36
     jobs:
@@ -88,11 +117,10 @@
     branch: "master"
     mvn-settings: "cps-ncmp-dmi-plugin-settings"
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: cps-ncmp-dmi-plugin-sonar-verify
-    java-version: openjdk11
+    java-version: openjdk17
     mvn-version: "mvn36"
     maven-version: "mvn36"
     jobs:
@@ -108,4 +136,3 @@
     branch: "master"
     mvn-settings: "cps-ncmp-dmi-plugin-settings"
     mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"