fix(2288): fix sonarqube setting (#36)

screwdriver-cd · Dec 3, 2020 · 4b1d4f5 · 4b1d4f5
1 parent cc32afd
commit 4b1d4f5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/mocha.config.json b/mocha.config.json
@@ -0,0 +1,6 @@
+{
+    "reporterEnabled": "spec, mocha-sonarqube-reporter",
+    "mochaSonarqubeReporterReporterOptions": {
+        "output": "./artifacts/report/test.xml"
+    }
+}
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "pretest": "eslint .",
-    "test": "jenkins-mocha --recursive",
+    "test": "nyc --report-dir ./artifacts/coverage --reporter=lcov mocha --reporter mocha-multi-reporters --reporter-options configFile=./mocha.config.json --recursive --timeout 4000 --retries 1 --exit --allow-uncaught true --color true",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },
   "repository": {
@@ -37,7 +37,10 @@
     "chai": "^4.1.2",
     "eslint": "^4.19.1",
     "eslint-config-screwdriver": "^3.0.0",
-    "jenkins-mocha": "^8.0.0",
+    "mocha": "^8.2.1",
+    "mocha-multi-reporters": "^1.5.1",
+    "mocha-sonarqube-reporter": "^1.0.2",
+    "nyc": "^15.0.0",
     "rewire": "^4.0.1",
     "sinon": "^7.5.0"
   },

diff --git a/screwdriver.yaml b/screwdriver.yaml
@@ -4,7 +4,7 @@ shared:
 jobs:
     main:
         environment:
-            SD_SONAR_OPTS: "-Dsonar.sources=. -Dsonar.inclusions=*.js -Dsonar.exclusions=test/*,**/node_modules/** -Dsonar.javascript.lcov.reportPath=artifacts/coverage/lcov.info"
+            SD_SONAR_OPTS: "-Dsonar.sources=index.js,lib -Dsonar.tests=test -Dsonar.javascript.lcov.reportPaths=artifacts/coverage/lcov.info -Dsonar.testExecutionReportPaths=artifacts/report/test.xml"
         steps:
             - install: npm install
             - test: npm test