Use gerrit-cli-sonar for nonrtric-plt-sme

Issue-ID: NONRTRIC-812
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Change-Id: If11dabec8765168ac6d976fa5dc7ffa3c87010f3

diff --git a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
index dc5303e..06b0dd0 100644 (file)
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -5,19 +5,34 @@
     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
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-name: '{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+
 - project:
-    <<: *sme_common
+    <<: *nonrtric_plt_sme_common
     name: nonrtric-plt-sme-capifcore
     project-name: '{name}'
     # image name
@@ -44,15 +59,13 @@
           branch: master
 
 - project:
-    <<: *sme_common
+    <<: *nonrtric_plt_sme_common
     name: nonrtric-plt-sme-capifcore-sonar
-    project-name: nonrtric-plt-sme-capifcore
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'capifcore/.*'
     build-node: ubuntu1804-docker-4c-4g
-    java-version: openjdk11
     sonarcloud: true
     sonar-project-file: ""
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-project-name: '{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
       - gerrit-cli-sonar