Refactor: JJB code

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

diff --git a/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml b/jjb/nonrtric-plt-a1policymanagementservice/nonrtric-plt-a1policymanagementservice.yaml
index 63fba76..5e9e936 100644 (file)
--- 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,33 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          java-version: openjdk11
+          branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 # nonrtric:a1policymanagementservice/
 # Maven artifacts for nonrtric-plt-a1policymanagementservice/
 - project:
     <<: *a1policymanagementservice_jdk_common
-    name: nonrtric-plt-a1policymanagementservice-service
-    project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
+    name: nonrtric-plt-a1policymanagementservice
+    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
+      - f-release:
+          java-version: openjdk11
+          branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 - project:
     <<: *a1policymanagementservice_jdk_common
@@ -58,4 +69,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"