X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fric-plt-e2mgr%2Fric-plt-e2mgr.yaml;h=52012aecddd1715abbecb28f133c01b7595c902f;hp=1288b5948d27a3bb59473a2f636e9d2983214c51;hb=refs%2Fheads%2Fmaster;hpb=6c667dc97080a9a8677b78ab16d792995e1c7ccd

diff --git a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
index 1288b594..52012aec 100644
--- a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
+++ b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
@@ -5,16 +5,8 @@
     views:
       - project-view
 
-- project:
-    name: ric-plt-e2mgr-info
-    project: ric-plt/e2mgr
-    project-name: ric-plt-e2mgr
-    build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- e2mgr_docker_common: &e2mgr_docker_common
-    # values apply to all E2MGR docker projects
+- _e2mgr_docker_common:
+    &e2mgr_docker_common # values apply to all E2MGR docker projects
     name: e2mgr-docker-common
     # git repo
     project: ric-plt/e2mgr
@@ -27,15 +19,15 @@
     <<: *e2mgr_docker_common
     name: ric-plt-e2mgr
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: "o-ran-sc/{name}"
     # Dockerfile is in a subdir
     docker-root: E2Manager
     # source of docker tag
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
@@ -47,7 +39,7 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"
 
 - project:
     name: ric-plt-e2mgr-sonar
@@ -56,28 +48,29 @@
     # 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
     sonar-properties: |
-        # Required metadata
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        # Encoding
-        sonar.build.sourceEncoding=UTF-8
-        # Language
-        sonar.language=go
-        # Source
-        sonar.sources=E2Manager
-        # Unit tests
-        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
+      # Required metadata
+      sonar.login={sonarcloud_api_token}
+      sonar.projectKey={sonarcloud_project_organization}_{project-name}
+      sonar.projectName={project-name}
+      sonar.organization={sonarcloud_project_organization}
+      # Encoding
+      sonar.build.sourceEncoding=UTF-8
+      # Language
+      sonar.language=go
+      # Source
+      sonar.sources=E2Manager
+      # Unit tests
+      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