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

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

diff --git a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
index 3d4283e..79a5c28 100644 (file)
--- a/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
+++ b/jjb/nonrtric-plt-informationcoordinatorservice/nonrtric-plt-informationcoordinatorservice.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- informationcoordinatorservice_jdk_common: &informationcoordinatorservice_jdk_common
+- _informationcoordinatorservice_jdk_common: &informationcoordinatorservice_jdk_common
     name: informationcoordinatorservice-jdk-common
     # git repo
     project: nonrtric/plt/informationcoordinatorservice
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-plt-informationcoordinatorservice-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     <<: *informationcoordinatorservice_jdk_common
@@ -34,6 +34,12 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          java-version: openjdk11
+          branch: f-release
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
 
 # nonrtric:informationcoordinatorservice
 # Maven artifacts for nonrtric-plt-informationcoordinatorservice
@@ -44,12 +50,17 @@
     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:
     <<: *informationcoordinatorservice_jdk_common
@@ -63,12 +74,12 @@
 - project:
     <<: *informationcoordinatorservice_jdk_common
     name: nonrtric-plt-informationcoordinatorservice-sonar
-    project-name: '{name}'
+    project-name: nonrtric-plt-informationcoordinatorservice
     # 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-informationcoordinatorservice'
+    sonarcloud-project-key: 'nonrtric-plt-informationcoordinatorservice'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
       - gerrit-maven-sonar