X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-sme%2Fnonrtric-plt-sme.yaml;fp=jjb%2Fnonrtric-plt-sme%2Fnonrtric-plt-sme.yaml;h=ff1d3d6ccc99d00ff11dc948825915d1dff8a733;hb=304f332b8eba7450838b1b0be1074120e9fc791d;hp=83bd14739b477610ebc642a67c4af1b36298f087;hpb=3a33180863c8aa3876364ae115bc148b77368ca6;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 83bd1473..ff1d3d6c 100644
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -61,11 +61,38 @@
       - 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"
+    # Directory with Dockerfile
+    docker-root: "servicemanager"
+    # 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
@@ -73,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