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

[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 06b0dd0..9a7c599 100644 (file)
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -27,9 +27,15 @@
     # 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:
+    <<: *nonrtric_plt_sme_common
+    name: nonrtric-plt-sme-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'
 
 - project:
     <<: *nonrtric_plt_sme_common
@@ -39,6 +45,7 @@
     docker-name: 'o-ran-sc/nonrtric-plt-capifcore'
     # get tag from YAML
     container-tag-method: yaml-file
+    container-tag-yaml-dir: capifcore
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
     # Directory with Dockerfile
@@ -57,15 +64,22 @@
     stream:
       - master:
           branch: master
+      - g-release:
+          branch: g-release
 
 - project:
     <<: *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
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'capifcore/.*'
-    build-node: ubuntu1804-docker-4c-4g
-    sonarcloud: true
+    sonar-prescan-script: !include-raw-escape: prescan-capifcore-ubuntu.sh
     sonar-project-file: ""
+    java-version: openjdk11
+    # use sonarcloud values from defaults.yaml
+    sonar-properties: !include-raw: sonar-project.properties
     jobs:
-      - gerrit-cli-sonar
+      - gerrit-sonar-prescan-script