X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-rapp-ransliceassurance%2Fnonrtric-rapp-ransliceassurance.yaml;h=10cb9d1c2a31ffe4cfa96db9b7e9924469e79929;hb=4bfd3d5dbc03f77eb5aed2ab9ca3843bc3732841;hp=f35a376fba5562633b44f71f29a6a4511886e4f4;hpb=c6be42afdabc97dc9e5b05154b0672104c1cb5e1;p=ci-management.git

diff --git a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
index f35a376f..10cb9d1c 100644
--- a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
+++ b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- ransliceassurance_common: &ransliceassurance_common
+- _ransliceassurance_common: &ransliceassurance_common
     name: ransliceassurance-common
     # git repo
     project: nonrtric/rapp/ransliceassurance
@@ -29,55 +29,61 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *ransliceassurance_common
     name: nonrtric-rapp-ransliceassurance
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-rapp-ransliceassurance'
+    docker-name: "o-ran-sc/nonrtric-rapp-ransliceassurance"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'smoversion'
+    docker-root: "smoversion"
     # Directory where go test should be run
-    go-root: 'smoversion'
+    go-root: "smoversion"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
-      - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
+      - g-release:
+          branch: g-release
 
 - project:
     <<: *ransliceassurance_common
     name: nonrtric-rapp-ransliceassurance-icsversion
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-rapp-ransliceassurance-icsversion'
+    docker-name: "o-ran-sc/nonrtric-rapp-ransliceassurance-icsversion"
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'icsversion'
+    docker-root: "icsversion"
     # Directory where go test should be run
-    go-root: 'icsversion'
+    go-root: "icsversion"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
       - "{project-name}-gerrit-docker-jobs"
       - gerrit-go-verify
-      - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
+      - g-release:
+          branch: g-release
 
 - project:
     <<: *ransliceassurance_common
@@ -90,6 +96,6 @@
     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