APIGOV-26268 - sonar

Axway · Oct 20, 2023 · e8b3e49 · e8b3e49
1 parent 94efbd1
commit e8b3e49
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 413 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -19,7 +19,8 @@ variables:
 
 stages:
   - test
-  - sonar
+  - sonar-preview
+  - sonar-publish
   - build
   - security-scans
   - security-review
@@ -28,8 +29,11 @@ stages:
 # Section for included yaml files
 ############################################################
 include:
+  - project: "apigov/gitlabci"
+    ref: master
+    file: "/.gitlab-ci-sonar.yml"
   - project: "apigov/beano_cicd"
-    ref: $BEANO_CICD_LATEST
+    ref: APIGOV-26268
     # the order of these include files is important
     file:
       - "/gitlabci/variables.yml"
@@ -147,9 +151,3 @@ twistlock:
 twistlock:on-schedule:
   rules:
     - !reference [.only-never-rule, rules]
-
-###################
-# These overridden from jobs.xml to never run      
-###################
-test:
-  extends: .only-never
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -12,5 +12,4 @@ whitesource.config @dfeldick
 # cicd-related files
 .gitlab-ci.yml @dfeldick @jcollins @vchauhan
 Makefile @dfeldick @jcollins @vchauhan
-sonar.sh @dfeldick @jcollins @vchauhan
 build/scripts/ @dfeldick @jcollins @vchauhan
diff --git a/Makefile b/Makefile
@@ -46,9 +46,6 @@ test-sonar: dep
 	@go vet ${GO_PKG_LIST}
 	@go test -short -coverpkg=./... -coverprofile=${WORKSPACE}/gocoverage.out -count=1 ${GO_PKG_LIST} -json > ${WORKSPACE}/goreport.json
 
-sonar: test-sonar
-	./sonar.sh $(sonarHost)
-
 sdk-version:
 	@echo $(SDK_VERSION)
 

diff --git a/coverage/coverage.cov b/coverage/coverage.cov