Adapt nonrtric-plt-sme to capifcore in folder

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

diff --git a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
index d4164df..4b29453 100644 (file)
--- a/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
+++ b/jjb/nonrtric-plt-sme/nonrtric-plt-sme.yaml
@@ -5,47 +5,35 @@
     views:
       - project-view
 
-- project:
+- project: &sme_common
     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
-      
-- sme_common: &sme_common
-    name: 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
-
-- project:
-    <<: *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:
     <<: *sme_common
-    name: nonrtric-plt-sme
+    name: nonrtric-plt-capifcore
     project-name: '{name}'
     # image name
-    docker-name: 'o-ran-sc/nonrtric-plt-sme'
+    docker-name: 'o-ran-sc/nonrtric-plt-capifcore'
     # get tag from YAML
     container-tag-method: yaml-file
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
     # Directory with Dockerfile
-    docker-root: '.'
+    docker-root: 'capifcore'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'capifcore/.*'
     # Directory where go test should be run
-    go-root: '.'
+    go-root: 'capifcore'
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -57,12 +45,15 @@
 
 - project:
     <<: *sme_common
-    name: nonrtric-plt-sme-sonar
-    project-name: nonrtric-plt-sme
+    name: nonrtric-plt-capifcore-sonar
+    project-name: nonrtric-plt-capifcore
     # prescan script requires ubuntu
     # golang is only on docker-enabled nodes
     build-node: ubuntu1804-docker-4c-4g
-    sonar-prescan-script: !include-raw-escape: prescan-sme-ubuntu.sh
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'capifcore/.*'
+    sonar-prescan-script: !include-raw-escape: prescan-capifcore-ubuntu.sh
     sonar-project-file: ""
     java-version: openjdk11
     # use sonarcloud values from defaults.yaml

diff --git a/jjb/nonrtric-plt-sme/prescan-sme-ubuntu.sh b/jjb/nonrtric-plt-sme/prescan-capifcore-ubuntu.sh
similarity index 95%
rename from jjb/nonrtric-plt-sme/prescan-sme-ubuntu.sh
rename to jjb/nonrtric-plt-sme/prescan-capifcore-ubuntu.sh
index 3e1db20..78fdf8b 100644 (file)
--- a/jjb/nonrtric-plt-sme/prescan-sme-ubuntu.sh
+++ b/jjb/nonrtric-plt-sme/prescan-capifcore-ubuntu.sh
@@ -25,6 +25,6 @@ set -ex
 sudo apt-get update
 
 # build script execution
-bash ./build-sme-ubuntu.sh
+bash capifcore/build-capifcore-ubuntu.sh
 
 echo "--> prescan-sme-ubuntu.sh ends"

diff --git a/jjb/nonrtric-plt-sme/sonar-project.properties b/jjb/nonrtric-plt-sme/sonar-project.properties
index bb3a453..7972aa1 100644 (file)
--- a/jjb/nonrtric-plt-sme/sonar-project.properties
+++ b/jjb/nonrtric-plt-sme/sonar-project.properties
@@ -9,8 +9,8 @@ sonar.language=go
 # Source
 sonar.sources=.
 # Unit tests
-sonar.go.coverage.reportPaths=coverage.txt
+sonar.go.coverage.reportPaths=capifcore/coverage.txt
 # Inclusions
-sonar.inclusions=main.go,internal/**/**.go
+sonar.inclusions=capifcore/main.go,capifcore/internal/**/**.go
 # Exclusions
-sonar.exclusions=main_test.go,internal/,internal/**/*_test.go,internal/**/*.gen.go,internal/**/mocks/**
+sonar.exclusions=capifcore/main_test.go,capifcore/internal/,capifcore/internal/**/*_test.go,capifcore/internal/**/*.gen.go,capifcore/internal/**/mocks/**