Skip to content
Snippets Groups Projects
Commit 96ce8f75 authored by Etienne LOUPIAS's avatar Etienne LOUPIAS
Browse files

Merge branch 'ci-fix-mr-pipeline' into 'dev'

ci: fix mr pipeline

See merge request !869
parents aedb68fc 553837b8
No related branches found
No related tags found
2 merge requests!907V3.2.0,!869ci: fix mr pipeline
...@@ -86,6 +86,7 @@ sonarqube: ...@@ -86,6 +86,7 @@ sonarqube:
stage: quality stage: quality
only: only:
- dev - dev
needs: []
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4 image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4
variables: variables:
SONAR_USER_HOME: '${CI_PROJECT_DIR}/.sonar' # Defines the location of the analysis task cache SONAR_USER_HOME: '${CI_PROJECT_DIR}/.sonar' # Defines the location of the analysis task cache
...@@ -106,6 +107,31 @@ sonarqube: ...@@ -106,6 +107,31 @@ sonarqube:
-Dsonar.login=${SONAR_TOKEN} -Dsonar.login=${SONAR_TOKEN}
-Dsonar.qualitygate.wait=true -Dsonar.qualitygate.wait=true
sonarqube-mr:
stage: quality
only:
- merge_requests
needs: []
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/sonarsource/sonar-scanner-cli:4
variables:
SONAR_USER_HOME: '${CI_PROJECT_DIR}/.sonar' # Defines the location of the analysis task cache
GIT_DEPTH: '0' # T
cache:
key: '${CI_JOB_NAME}'
paths:
- .sonar/cache
script:
- >
sonar-scanner
-Dsonar.projectName=${SONAR_PROJECT_KEY}
-Dsonar.projectVersion=1.0
-Dsonar.sourceEncoding=UTF-8
-Dsonar.projectBaseDir=.
-Dsonar.host.url=${SONAR_URL}
-Dsonar.projectKey=${SONAR_PROJECT_KEY}
-Dsonar.login=${SONAR_MR_TOKEN}
-Dsonar.qualitygate.wait=true
.deploy: .deploy:
script: script:
- if [ "$CI_ENVIRONMENT_NAME" == "dev" ]; then export KUBECONFIG=$KUBECONFIG_DEV; fi - if [ "$CI_ENVIRONMENT_NAME" == "dev" ]; then export KUBECONFIG=$KUBECONFIG_DEV; fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment