X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-dmaapadapter%2Fnonrtric-plt-dmaapadapter.yaml;h=83a0d0b78330ad2a7bb0b554eb6ae5394bc94de2;hb=e190bcab1ddef58522947076ef24ce306d692bcd;hp=e6ed20f421e7ccef72afab353bb331f009ec16fd;hpb=69687a07d6ebd2adc7dbd9fdd13232a0b9b59707;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..83a0d0b7 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
@@ -34,16 +34,19 @@
     stream:
       - master:
           branch: master
-      - f-release:
-          branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
+      - h-release:
+          branch: h-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
@@ -51,8 +54,11 @@
     stream:
       - master:
           branch: master
-      - f-release:
-          branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *dmaapadapter_jdk_common
@@ -61,17 +67,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