X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-sme%2Fnonrtric-plt-sme.yaml;h=05f77b66e160ec1fc3f4ddf29bf24e2c28d84123;hb=refs%2Fheads%2Fmaster;hp=c38271cb02bd0bf6c41713b2788137ef145e632a;hpb=439502c44e9eaa7ef2436564f734d5d760ab99d1;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 c38271cb..05f77b66 100644
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -5,16 +5,6 @@
     views:
       - project-view
 
-- project:
-    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
-
 - _nonrtric_plt_sme_common:
     &nonrtric_plt_sme_common # values apply to all projects here
     name: nonrtric-plt-sme-common
@@ -66,12 +56,43 @@
           branch: master
       - g-release:
           branch: g-release
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
+
+- project:
+    <<: *nonrtric_plt_sme_common
+    name: nonrtric-plt-sme-servicemanager
+    project-name: "{name}"
+    # image name
+    docker-name: "o-ran-sc/nonrtric-plt-servicemanager"
+    # get tag from YAML
+    container-tag-method: yaml-file
+    container-tag-yaml-dir: servicemanager
+    # use host network to clone from our gerrit
+    docker-build-args: "--network=host -f servicemanager/Dockerfile"
+    # Dockerfile is in a subdir
+    docker-root: "."
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "servicemanager/.*"
+    # Directory where go test should be run
+    go-root: "servicemanager"
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
+    stream:
+      - master:
+          branch: master
 
 - project:
     <<: *nonrtric_plt_sme_common
     name: nonrtric-plt-sme-capifcore-sonar
-    # prescan script requires ubuntu
-    # golang is only on docker-enabled nodes
+    project-name: nonrtric-plt-sme-capifcore
     build-node: ubuntu1804-docker-4c-4g
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -79,7 +100,41 @@
     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
+    sonar-properties: |
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.projectName={project-name}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.language=go
+      sonar.projectBaseDir=capifcore
+      sonar.go.coverage.reportPaths=coverage.txt
+      sonar.inclusions=**/*.go
+      sonar.exclusions=**/*_test.go
+    jobs:
+      - gerrit-sonar-prescan-script
+
+- project:
+    <<: *nonrtric_plt_sme_common
+    name: nonrtric-plt-sme-servicemanager-sonar
+    project-name: nonrtric-plt-sme-servicemanager
+    build-node: ubuntu1804-docker-4c-4g
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "servicemanager/.*"
+    sonar-prescan-script: !include-raw-escape: prescan-servicemanager-ubuntu.sh
+    sonar-project-file: ""
+    java-version: openjdk11
     jobs:
       - gerrit-sonar-prescan-script
+    sonar-properties: |
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.organization={sonarcloud_project_organization}
+      sonar.projectName={project-name}
+      sonar.build.sourceEncoding=UTF-8
+      sonar.language=go
+      sonar.projectBaseDir=servicemanager
+      sonar.go.coverage.reportPaths=coverage.txt
+      sonar.inclusions=**/*.go
+      sonar.exclusions=**/*_test.go