X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-sme%2Fnonrtric-plt-sme.yaml;h=6f952b46fc5952175cbde9afdb7819910977a140;hb=c46bfa0b1a490006a53fde49610c8f909d1e1d4f;hp=06b0dd09b021f9304f354ee9764e54dc2627b703;hpb=45ad6fa38448bfd6eb022669746ec197d6827b59;p=ci-management.git

diff --git a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
index 06b0dd09..6f952b46 100644
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -15,8 +15,8 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- nonrtric_plt_sme_common: &nonrtric_plt_sme_common
-    # values apply to all projects here
+- _nonrtric_plt_sme_common:
+    &nonrtric_plt_sme_common # values apply to all projects here
     name: nonrtric-plt-sme-common
     # git repo
     project: nonrtric/plt/sme
@@ -27,28 +27,35 @@
     # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
     java-version: openjdk11
     mvn-version: mvn36
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-project-name: '{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+
+- project:
+    <<: *nonrtric_plt_sme_common
+    name: nonrtric-plt-sme-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:
     <<: *nonrtric_plt_sme_common
     name: nonrtric-plt-sme-capifcore
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/nonrtric-plt-capifcore'
+    docker-name: "o-ran-sc/nonrtric-plt-capifcore"
     # get tag from YAML
     container-tag-method: yaml-file
+    container-tag-yaml-dir: capifcore
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     # Directory with Dockerfile
-    docker-root: 'capifcore'
+    docker-root: "capifcore"
     # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'capifcore/.*'
+        pattern: "capifcore/.*"
     # Directory where go test should be run
-    go-root: 'capifcore'
+    go-root: "capifcore"
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -57,15 +64,24 @@
     stream:
       - master:
           branch: master
+      - g-release:
+          branch: g-release
+      - h-release:
+          branch: h-release
 
 - project:
     <<: *nonrtric_plt_sme_common
     name: nonrtric-plt-sme-capifcore-sonar
+    # prescan script requires ubuntu
+    # golang is only on docker-enabled nodes
+    build-node: ubuntu1804-docker-4c-4g
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'capifcore/.*'
-    build-node: ubuntu1804-docker-4c-4g
-    sonarcloud: true
+        pattern: "capifcore/.*"
+    sonar-prescan-script: !include-raw-escape: prescan-capifcore-ubuntu.sh
     sonar-project-file: ""
+    java-version: openjdk11
+    # use sonarcloud values from defaults.yaml
+    sonar-properties: !include-raw-escape: sonar-project.properties
     jobs:
-      - gerrit-cli-sonar
+      - gerrit-sonar-prescan-script