X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-sme%2Fnonrtric-plt-sme.yaml;h=9a7c5993b6902ba81dfcc64c606084b651f96df9;hb=77e94416b036507186686033dabcbe010eb67884;hp=dc5303e169b6f790d440cae60b45ed9d99f5216a;hpb=dc9413c623a742ad1719712712c6ed6ecf0397f2;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 dc5303e1..9a7c5993 100644
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -5,25 +5,47 @@
     views:
       - project-view
 
-- project: &sme_common
+- project:
     name: nonrtric-plt-sme-info
     project: nonrtric/plt/sme
     project-name: nonrtric-plt-sme
     # maven settings file has docker credentials
-    mvn-settings: nonrtric-plt-sme-settings
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
       - gerrit-info-yaml-verify
 
+- 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
+    # jenkins job name prefix
+    project-name: nonrtric-plt-sme
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-plt-sme-settings
+    # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
+    java-version: openjdk11
+    mvn-version: mvn36
+
 - project:
-    <<: *sme_common
+    <<: *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}'
     # image name
     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'
     # Directory with Dockerfile
@@ -42,17 +64,22 @@
     stream:
       - master:
           branch: master
+      - g-release:
+          branch: g-release
 
 - project:
-    <<: *sme_common
+    <<: *nonrtric_plt_sme_common
     name: nonrtric-plt-sme-capifcore-sonar
-    project-name: nonrtric-plt-sme-capifcore
+    # prescan script requires ubuntu
+    # golang is only on docker-enabled nodes
     build-node: ubuntu1804-docker-4c-4g
-    java-version: openjdk11
-    sonarcloud: true
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'capifcore/.*'
+    sonar-prescan-script: !include-raw-escape: prescan-capifcore-ubuntu.sh
     sonar-project-file: ""
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-project-name: '{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    java-version: openjdk11
+    # use sonarcloud values from defaults.yaml
+    sonar-properties: !include-raw: sonar-project.properties
     jobs:
-      - gerrit-cli-sonar
+      - gerrit-sonar-prescan-script