X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-rapp-orufhrecovery%2Fnonrtric-rapp-orufhrecovery.yaml;h=d2e944f50580159565e19f001e4049fc2e215c8d;hb=8eb77018c21b7786d50e18a0c181e3612044004b;hp=fde717c45631e989fbba95a0d5e83f7de85eed34;hpb=28c3a86e910077886ceab5d990411ec81a82c737;p=ci-management.git

diff --git a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
index fde717c4..d2e944f5 100644
--- a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
+++ b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
@@ -12,8 +12,6 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-rapp-orufhrecovery-settings
     build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
 
 - project:
     <<: *orufhrecovery_common
@@ -22,24 +20,24 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     <<: *orufhrecovery_common
     name: nonrtric-rapp-orufhrecovery
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-rapp-orufhrecovery'
+    docker-name: "o-ran-sc/nonrtric-rapp-orufhrecovery"
     # 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: 'scriptversion/app'
+    docker-root: "scriptversion/app"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'scriptversion/app/.*'
+        pattern: "scriptversion/app/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -47,25 +45,29 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
+      - g-release:
+          branch: g-release
 
 - project:
     <<: *orufhrecovery_common
     name: nonrtric-rapp-orufhrecovery-consumer
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-rapp-orufhrecovery-consumer'
+    docker-name: "o-ran-sc/nonrtric-rapp-orufhrecovery-consumer"
     # 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: 'goversion'
+    docker-root: "goversion"
     # Directory where go test should be run
-    go-root: 'goversion'
+    go-root: "goversion"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'goversion/.*'
+        pattern: "goversion/.*"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -74,34 +76,39 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
+      - g-release:
+          branch: g-release
 
 - project:
     <<: *orufhrecovery_common
     name: nonrtric-rapp-orufhrecovery-consumer-sonar
-    project-name: '{name}'
+    project-name: "nonrtric-rapp-orufhrecovery-consumer"
     # prescan script requires ubuntu
     # golang is only on docker-enabled nodes
     build-node: ubuntu1804-docker-4c-4g
-    sonar-prescan-script: !include-raw-escape: prescan-oruclosedloopconsumer-ubuntu.sh
+    sonar-prescan-script: !include-raw-escape:
+      - prescan-oruclosedloopconsumer-ubuntu.sh
     sonar-project-file: ""
     java-version: openjdk11
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_nonrtric-rapp-orufhrecovery-consumer
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=.
-        # Unit tests
-        sonar.go.coverage.reportPaths=goversion/coverage.txt
-        # Inclusions
-        sonar.inclusions=goversion/internal/**/**.go,goversion/**.go
-        # Exclusions
-        sonar.exclusions=goversion/mocks/**.go,goversion/internal/**/**_test.go,goversion/**_test.go,goversion/simulator/**.go
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey=nonrtric-rapp-orufhrecovery-consumer
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=.
+      # Unit tests
+      sonar.go.coverage.reportPaths=goversion/coverage.txt
+      # Inclusions
+      sonar.inclusions=goversion/internal/**/**.go,goversion/**.go
+      # Exclusions
+      sonar.exclusions=goversion/mocks/**.go,goversion/internal/**/**_test.go,goversion/**_test.go,goversion/simulator/**.go
     jobs:
       - gerrit-sonar-prescan-script