Merge "Automation adds nonrtric-plt-dmaapadapter.yaml"

diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index 72dd525..e6dfb09 100644 (file)
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -9,6 +9,6 @@ RELEASE_EMAIL=collab-it+o-ran-sc-release@linuxfoundation.org
 RELEASE_USERNAME=o-ran-sc-release
 S3_BUCKET=
 SIGUL_BRIDGE_IP=44.232.126.158
-SIGUL_KEY=oran-release-2019
+SIGUL_KEY=oran-release-2022
 SILO=production
 MASTER_RTD_PROJECT=doc

diff --git a/jenkins-config/managed-config-files/custom/sigul-config/content b/jenkins-config/managed-config-files/custom/sigul-config/content
index d07ba54..96558f4 100644 (file)
--- a/jenkins-config/managed-config-files/custom/sigul-config/content
+++ b/jenkins-config/managed-config-files/custom/sigul-config/content
@@ -2,7 +2,7 @@
 bridge-hostname: sigul-bridge-us-west-2.linuxfoundation.org
 bridge-port: 44334
 client-cert-nickname: $SIGUL_CONFIG_USR
-server-hostname: aws-us-west-2-lfit-sigul-bridge-1.dr.codeaurora.org
+server-hostname: aws-us-west-2-lfit-sigul-server-1.dr.codeaurora.org
 user-name: $SIGUL_CONFIG_USR
 
 [koji]

diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml
index 42fd7a9..59b0dbc 100644 (file)
--- a/jjb/ci-management/ci-jobs.yaml
+++ b/jjb/ci-management/ci-jobs.yaml
@@ -14,8 +14,12 @@
     build-node-label-list: ""
 
     jobs:
-      - '{project-name}-ci-jobs'
       - 'gerrit-info-yaml-verify'
+      - gerrit-jenkins-cfg-verify
+      - gerrit-jenkins-sandbox-cleanup
+      - gerrit-jjb-deploy-job
+      - gerrit-jjb-merge
+      - gerrit-jjb-verify
 
     <<: *ci_jobs_common
 

diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
new file mode 100644 (file)
index 0000000..c68ea8f
--- /dev/null
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: nonrtric-plt-rappcatalogue-project-view
+    project-name: nonrtric-plt-rappcatalogue
+    views:
+      - project-view
+
+- project:
+    name: nonrtric-plt-rappcatalogue-info
+    project: nonrtric/plt/rappcatalogue
+    project-name: nonrtric-plt-rappcatalogue
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/ric-plt-sdlgo/prescan-sdlgo-go-ubuntu.sh b/jjb/ric-plt-sdlgo/prescan-sdlgo-go-ubuntu.sh
index b9c27b5..18d4d54 100644 (file)
--- a/jjb/ric-plt-sdlgo/prescan-sdlgo-go-ubuntu.sh
+++ b/jjb/ric-plt-sdlgo/prescan-sdlgo-go-ubuntu.sh
@@ -58,11 +58,11 @@ hash=$(git rev-parse --short HEAD || true)
 
 # Build
 
-go build -a -installsuffix cgo -ldflags "-X main.Version=$tag -X main.Hash=$hash" -o ./cmd/*.go
+go build ./...
 
 # Execute UT and measure coverage
 
-go test . -v -coverprofile cover.out || true
+go test ./... -v -coverprofile cover.out || true
 
 echo "--> build_sdlgo_ubuntu.sh ends"
 

diff --git a/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml b/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml
index 3e2a454..41592ab 100644 (file)
--- a/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml
+++ b/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml
@@ -60,11 +60,11 @@
         # Source
         sonar.sources=.
         # Unit tests
-        sonar.go.coverage.reportPaths=./cover.out,/internal/sdlgoredis/cover.out
+        sonar.go.coverage.reportPaths=**/cover.out
         # Inclusions
         sonar.inclusions=**/*.go
         # Exclusions
-        sonar.exclusions=**/*_test.go
+        sonar.exclusions=cmd/**.go,example/**.go,internal/mocks/**.go,**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script