Skip to content
Snippets Groups Projects
Commit 78ece639 authored by OZGCloud's avatar OZGCloud
Browse files

adjust Jenkinsfile formatting; remove try catch for ci-test

parent b2f76ee5
No related branches found
No related tags found
No related merge requests found
...@@ -49,14 +49,11 @@ pipeline { ...@@ -49,14 +49,11 @@ pipeline {
sh 'npm run ci-build-admin' sh 'npm run ci-build-admin'
} }
if (isMasterBranch()) { if (isMasterBranch()) {
try {
withSonarQubeEnv('sonarqube-ozg-sh'){ withSonarQubeEnv('sonarqube-ozg-sh'){
sh 'npm run ci-sonar-admin' sh 'npm run ci-sonar'
}
}
catch (Exception e) {
unstable("SonarQube failed")
} }
} else {
sh 'npm run ci-test'
} }
} }
} }
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
"ci-prodBuild-admin": "nx container admin && cp -r dist/ apps/admin/", "ci-prodBuild-admin": "nx container admin && cp -r dist/ apps/admin/",
"ci-test": "nx run-many --target=test --parallel 8 -- --runInBand", "ci-test": "nx run-many --target=test --parallel 8 -- --runInBand",
"ci-sonar": "nx run-many --target=test --parallel 8 -- --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && npx sonar-scanner", "ci-sonar": "nx run-many --target=test --parallel 8 -- --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && npx sonar-scanner",
"ci-sonar-admin": "nx run admin:test --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && npx sonar-scanner -Dsonar.projectBaseDir=./apps/admin",
"lint": "nx workspace-lint && nx lint", "lint": "nx workspace-lint && nx lint",
"affected:apps": "nx affected:apps", "affected:apps": "nx affected:apps",
"affected:libs": "nx affected:libs", "affected:libs": "nx affected:libs",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment