Merge "NONRTRIC - Sonar support"

diff --git a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
index e49cf8c..adab68c 100644 (file)
--- a/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
+++ b/jjb/nonrtric-rapp-ransliceassurance/nonrtric-rapp-ransliceassurance.yaml
@@ -54,6 +54,29 @@
       - master:
           branch: master
 
+- project:
+    <<: *ransliceassurance_common
+    name: nonrtric-rapp-ransliceassurance-icsversion
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-rapp-ransliceassurance-icsversion'
+    # 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: 'icsversion'
+    # Directory where go test should be run
+    go-root: 'icsversion'
+    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:
     <<: *ransliceassurance_common
     name: nonrtric-rapp-ransliceassurance-sonar

diff --git a/jjb/nonrtric-rapp-ransliceassurance/prescan-ransliceassurance-ubuntu.sh b/jjb/nonrtric-rapp-ransliceassurance/prescan-ransliceassurance-ubuntu.sh
index bcb4e31..5bc7e9c 100644 (file)
--- a/jjb/nonrtric-rapp-ransliceassurance/prescan-ransliceassurance-ubuntu.sh
+++ b/jjb/nonrtric-rapp-ransliceassurance/prescan-ransliceassurance-ubuntu.sh
@@ -26,5 +26,6 @@ sudo apt-get update
 
 # build script execution
 bash smoversion/build-ransliceassurance-ubuntu.sh
+bash icsversion/build-ransliceassurance-ubuntu.sh
 
 echo "--> prescan-ransliceassurance-ubuntu.sh ends"

diff --git a/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties b/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties
index 38534a3..253b108 100644 (file)
--- a/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties
+++ b/jjb/nonrtric-rapp-ransliceassurance/sonar-project.properties
@@ -9,8 +9,8 @@ sonar.language=go
 # Source
 sonar.sources=.
 # Unit tests
-sonar.go.coverage.reportPaths=smoversion/coverage.txt
+sonar.go.coverage.reportPaths=smoversion/coverage.txt, icsversion/coverage.txt
 # Inclusions
-sonar.inclusions=smoversion/internal/**/**.go
+sonar.inclusions=smoversion/internal/**/**.go, icsversion/internal/**/**.go 
 # Exclusions
-sonar.exclusions=smoversion/main.go,smoversion/stub/**.go,smoversion/internal/**/**_test.go
+sonar.exclusions=smoversion/main.go,smoversion/stub/**.go,smoversion/internal/**/**_test.go, smoversion/main.go, icsversion/stub/**.go, icsversion/internal/**/**_test.go