X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fnonrtric-plt-sme%2Fnonrtric-plt-sme.yaml;h=06b0dd09b021f9304f354ee9764e54dc2627b703;hb=refs%2Fchanges%2F93%2F9393%2F5;hp=d4164df4f6620c87da640cd0119d93e80151af0c;hpb=cdc5ce14201a7cbb402cd9f17b3c97518d29d528;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 d4164df4..06b0dd09 100644
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -9,43 +9,46 @@
     name: nonrtric-plt-sme-info
     project: nonrtric/plt/sme
     project-name: nonrtric-plt-sme
+    # maven settings file has docker credentials
     build-node: centos7-builder-1c-1g
     branch: master
     jobs:
       - gerrit-info-yaml-verify
-      
-- sme_common: &sme_common
-    name: sme-common
+
+- 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
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-name: '{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
 
 - project:
-    <<: *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:
-    <<: *sme_common
-    name: nonrtric-plt-sme
+    <<: *nonrtric_plt_sme_common
+    name: nonrtric-plt-sme-capifcore
     project-name: '{name}'
     # image name
-    docker-name: 'o-ran-sc/nonrtric-plt-sme'
+    docker-name: 'o-ran-sc/nonrtric-plt-capifcore'
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
     # Directory with Dockerfile
-    docker-root: '.'
+    docker-root: 'capifcore'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'capifcore/.*'
     # Directory where go test should be run
-    go-root: '.'
+    go-root: 'capifcore'
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -56,16 +59,13 @@
           branch: master
 
 - project:
-    <<: *sme_common
-    name: nonrtric-plt-sme-sonar
-    project-name: nonrtric-plt-sme
-    # prescan script requires ubuntu
-    # golang is only on docker-enabled nodes
+    <<: *nonrtric_plt_sme_common
+    name: nonrtric-plt-sme-capifcore-sonar
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'capifcore/.*'
     build-node: ubuntu1804-docker-4c-4g
-    sonar-prescan-script: !include-raw-escape: prescan-sme-ubuntu.sh
+    sonarcloud: true
     sonar-project-file: ""
-    java-version: openjdk11
-    # use sonarcloud values from defaults.yaml
-    sonar-properties: !include-raw: sonar-project.properties
     jobs:
-      - gerrit-sonar-prescan-script
+      - gerrit-cli-sonar