X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-a1policymanagementservice%2Fnonrtric-plt-a1policymanagementservice.yaml;h=14caea310e7713122cb155dfaf840b08270636f2;hb=6a7f64dcadf15df415de983da154a0ae5d2f982c;hp=1b9d96c8d04391177feed29611435cbeb11309ba;hpb=a75a644ea577ef89d9e8b7167bc2c869f7c92ae5;p=ci-management.git

diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
index 1b9d96c8..14caea31 100644
--- a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
+++ b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- nonrtric_jdk_common: &a1policymanagementservice_jdk_common
+- _nonrtric_jdk_common: &a1policymanagementservice_jdk_common
     name: a1policymanagementservice-jdk-common
     # git repo
     project: nonrtric/plt/a1policymanagementservice
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-plt-a1policymanagementservice-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     <<: *a1policymanagementservice_jdk_common
@@ -34,22 +34,31 @@
     stream:
       - master:
           branch: master
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
+      - h-release:
+          branch: h-release
 
 # nonrtric:a1policymanagementservice/
 # Maven artifacts for nonrtric-plt-a1policymanagementservice/
 - project:
     <<: *a1policymanagementservice_jdk_common
     name: nonrtric-plt-a1policymanagementservice
-    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-merge
       - gerrit-maven-stage
       - gerrit-maven-clm
     stream:
       - master:
           branch: master
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *a1policymanagementservice_jdk_common
@@ -58,4 +67,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"