X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-dmaapadapter%2Fnonrtric-plt-dmaapadapter.yaml;h=71b8f811541b5a199c12d2292b02eadb58029956;hb=28d90b39dca32249f5d0659e231f137e63bbcbcc;hp=e6ed20f421e7ccef72afab353bb331f009ec16fd;hpb=e93852be15782ed4e29c66bca0529a6be85ca450;p=ci-management.git

diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
index e6ed20f4..71b8f811 100644
--- 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,15 +35,19 @@
       - 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/
 - project:
     <<: *dmaapadapter_jdk_common
     name: nonrtric-plt-dmaapadapter
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
+    project-name: "{name}"
+    mvn-opts: "-Ddocker.skip=true"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-stage
@@ -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
@@ -61,17 +69,17 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *dmaapadapter_jdk_common
     name: nonrtric-plt-dmaapadapter-sonar
     project-name: nonrtric-plt-dmaapadapter
     # template goal install builds docker image unnecessarily
-    mvn-params: '-Ddocker.skip=true'
+    mvn-params: "-Ddocker.skip=true"
     sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: 'nonrtric-plt-dmaapadapter'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "nonrtric-plt-dmaapadapter"
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
     jobs:
       - gerrit-maven-sonar