Merge "nonrtric: updates some jobs to JDK17"

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

diff --git a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
index 2b9f58e..bc1c6b2 100644 (file)
--- a/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
+++ b/jjb/nonrtric-rapp-orufhrecovery/nonrtric-rapp-orufhrecovery.yaml
@@ -15,6 +15,15 @@
     jobs:
       - gerrit-info-yaml-verify
 
+- project:
+    <<: *orufhrecovery_common
+    name: nonrtric-rapp-orufhrecovery-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
+
 - project:
     <<: *orufhrecovery_common
     name: nonrtric-rapp-orufhrecovery
@@ -38,6 +47,10 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
+      - g-release:
+          branch: g-release
 
 - project:
     <<: *orufhrecovery_common
@@ -65,11 +78,15 @@
     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
@@ -80,7 +97,7 @@
     sonar-properties: |
         # Required metadata
         sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_nonrtric-rapp-orufhrecovery-consumer
+        sonar.projectKey=nonrtric-rapp-orufhrecovery-consumer
         sonar.organization={sonarcloud_project_organization}
         # Encoding
         sonar.build.sourceEncoding=UTF-8