X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-sme%2Fnonrtric-plt-sme.yaml;h=dc5303e169b6f790d440cae60b45ed9d99f5216a;hb=dc9413c623a742ad1719712712c6ed6ecf0397f2;hp=d4164df4f6620c87da640cd0119d93e80151af0c;hpb=0db0e1018a3587605d032f8fde2fe474425eb8c1;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..dc5303e1 100644
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -5,47 +5,35 @@
     views:
       - project-view
 
-- project:
+- project: &sme_common
     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
-      
-- sme_common: &sme_common
-    name: 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
 
 - 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
+    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:
@@ -57,15 +45,14 @@
 
 - project:
     <<: *sme_common
-    name: nonrtric-plt-sme-sonar
-    project-name: nonrtric-plt-sme
-    # prescan script requires ubuntu
-    # golang is only on docker-enabled nodes
+    name: nonrtric-plt-sme-capifcore-sonar
+    project-name: nonrtric-plt-sme-capifcore
     build-node: ubuntu1804-docker-4c-4g
-    sonar-prescan-script: !include-raw-escape: prescan-sme-ubuntu.sh
-    sonar-project-file: ""
     java-version: openjdk11
-    # use sonarcloud values from defaults.yaml
-    sonar-properties: !include-raw: sonar-project.properties
+    sonarcloud: true
+    sonar-project-file: ""
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-name: '{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
-      - gerrit-sonar-prescan-script
+      - gerrit-cli-sonar