Refactor!: Update JJB code to comply with 5.x

[ci-management.git] / jjb / nonrtric-plt-dmaapadapter / nonrtric-plt-dmaapadapter.yaml

diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
index 1d644f8..a270e6b 100644 (file)
--- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
+++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- dmaapadapter_jdk_common: &dmaapadapter_jdk_common
+- _dmaapadapter_jdk_common: &dmaapadapter_jdk_common
     name: dmaapadapter-jdk-common
     # git repo
     project: nonrtric/plt/dmaapadapter
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-plt-dmaapadapter-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     <<: *dmaapadapter_jdk_common
@@ -35,7 +35,11 @@
       - master:
           branch: master
       - f-release:
+          java-version: openjdk11
           branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 # nonrtric:dmaapadapter/
 # Maven artifacts for nonrtric-plt-dmaapadapter/
@@ -52,7 +56,11 @@
       - master:
           branch: master
       - f-release:
+          java-version: openjdk11
           branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 - project:
     <<: *dmaapadapter_jdk_common
@@ -66,12 +74,12 @@
 - project:
     <<: *dmaapadapter_jdk_common
     name: nonrtric-plt-dmaapadapter-sonar
-    project-name: '{name}'
+    project-name: nonrtric-plt-dmaapadapter
     # template goal install builds docker image unnecessarily
     mvn-params: '-Ddocker.skip=true'
     sonarcloud: true
     sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric-plt-dmaapadapter'
+    sonarcloud-project-key: 'nonrtric-plt-dmaapadapter'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
       - gerrit-maven-sonar