Change Sonar nonrtric-plt-sme to prescan script

[ci-management.git] / jjb / nonrtric-plt-sme / nonrtric-plt-sme.yaml

diff --git a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
index 4b29453..12d9c59 100644 (file)
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -5,20 +5,32 @@
     views:
       - project-view
 
-- project: &sme_common
+- project:
     name: nonrtric-plt-sme-info
     project: nonrtric/plt/sme
     project-name: nonrtric-plt-sme
     # maven settings file has docker credentials
-    mvn-settings: nonrtric-plt-sme-settings
     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
+    # git repo
+    project: nonrtric/plt/sme
+    # jenkins job name prefix
+    project-name: nonrtric-plt-sme
+    # maven settings file has docker credentials
+    mvn-settings: nonrtric-plt-sme-settings
+    # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
+    java-version: openjdk11
+    mvn-version: mvn36
+
 - project:
-    <<: *sme_common
-    name: nonrtric-plt-capifcore
+    <<: *nonrtric_plt_sme_common
+    name: nonrtric-plt-sme-capifcore
     project-name: '{name}'
     # image name
     docker-name: 'o-ran-sc/nonrtric-plt-capifcore'
@@ -44,9 +56,8 @@
           branch: master
 
 - project:
-    <<: *sme_common
-    name: nonrtric-plt-capifcore-sonar
-    project-name: nonrtric-plt-capifcore
+    <<: *nonrtric_plt_sme_common
+    name: nonrtric-plt-sme-capifcore-sonar
     # prescan script requires ubuntu
     # golang is only on docker-enabled nodes
     build-node: ubuntu1804-docker-4c-4g