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

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

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 46f31bc..6f02f6d 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- nonrtric_jdk_common: &nonrtric_jdk_common
+- _nonrtric_jdk_common: &nonrtric_jdk_common
     name: nonrtric-jdk-common
     # git repo
     project: nonrtric
@@ -22,7 +22,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     <<: *nonrtric_jdk_common
@@ -185,9 +185,13 @@
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
     stream:
-      - all:
-          branch: '*'
+      - master:
+          branch: master
+      - f-release:
+          java-version: openjdk11
+          branch: f-release
       - g-release:
+          java-version: openjdk11
           branch: g-release
 
 - project:
@@ -201,7 +205,7 @@
     sonar-project-file: ""
     java-version: openjdk11
     # use sonarcloud values from defaults.yaml
-    sonar-properties: !include-raw: sonar-project.properties
+    sonar-properties: !include-raw-escape: sonar-project.properties
     jobs:
       - gerrit-sonar-prescan-script