Revert "Refactor!: Update JJB code to comply 5.x"

[ci-management.git] / jjb / ric-plt-e2mgr / ric-plt-e2mgr.yaml

diff --git a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
index 5b4766f..1aa1f9c 100644 (file)
--- a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
+++ b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
@@ -43,7 +43,6 @@
 - project:
     <<: *e2mgr_docker_common
     name: ric-plt-e2mgr-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g
@@ -57,6 +56,7 @@
     # prescan script requires ubuntu
     # golang is only on docker-enabled nodes
     build-node: ubuntu1804-docker-4c-4g
+    java-version: openjdk11
     sonar-prescan-script: !include-raw-escape: prescan-e2mgr-ubuntu.sh
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
@@ -73,10 +73,12 @@
         # Source
         sonar.sources=E2Manager
         # Unit tests
-        sonar.go.coverage.reportPaths=coverage.txt
+        sonar.go.coverage.reportPaths=E2Manager/coverage.txt
         # Inclusions
         sonar.inclusions=**/**.go
         # Exclusions
         sonar.exclusions=**/mocks/**.go,**/tests/**.go
+        # Test inclusions
+        sonar.test.inclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script