From 701f1746b8fe7a4db8b5c6515ea5d233bb0479ba Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Tue, 15 Jun 2021 15:05:38 +0200
Subject: [PATCH] feat: definitely remove SONAR_BRANCH_OPTS variable. GNP-5961.
---
.gitlab-ci.yml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0758fa5f..d1c57d56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,7 +64,6 @@ test-and-sonarqube:
GRADLE_OPTS: "-Dorg.gradle.daemon=true"
SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache
GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task
- SONAR_BRANCH_OPTS: "-Dsonar.pullrequest.key=$CI_MERGE_REQUEST_ID -Dsonar.pullrequest.branch=$CI_COMMIT_REF_NAME"
cache:
key: "${CI_JOB_NAME}"
paths:
@@ -74,7 +73,7 @@ test-and-sonarqube:
- ./gradlew :backend:test jacocoTestReport --parallel
- find /tmp/node/*/bin -name node -exec ln -s {} /tmp/node/node \;
- export PATH="/tmp/node/:$PATH"
- - ./gradlew -s sonarqube -x test $SONAR_BRANCH_OPTS
+ - ./gradlew -s sonarqube -x test
artifacts:
reports:
junit:
@@ -87,8 +86,6 @@ test-and-sonarqube:
test-and-sonarqube-master:
extends: test-and-sonarqube
- variables:
- SONAR_BRANCH_OPTS: ""
only:
refs:
- master
--
GitLab