From 7a4d78dc354f70ab2e5f0f29234d59664098b80a Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Fri, 7 May 2021 10:45:54 +0200
Subject: [PATCH 1/6] chore: force jacoco report file generation. GNP-6039.
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 267e2c93..e8f8f691 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,7 +65,7 @@ test-and-sonarqube:
SONAR_BRANCH_OPTS: "-Dsonar.pullrequest.key=$CI_MERGE_REQUEST_ID -Dsonar.pullrequest.branch=$CI_COMMIT_REF_NAME"
script:
- ./gradlew :frontend:test --parallel
- - ./gradlew :backend:test --parallel
+ - ./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
--
GitLab
From dbbe8c0ee6e732c59d776458270ac07aa2b8cccc Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Fri, 7 May 2021 10:46:37 +0200
Subject: [PATCH 2/6] chore: upgrade SonarQube plugin version. GNP-6039.
---
build.gradle.kts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index 24155372..085e086e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,3 @@
plugins {
- id("org.sonarqube") version "2.8"
+ id("org.sonarqube") version "3.2.0"
}
--
GitLab
From d0e06854e4a07f54352824dad5970ff2c3a94958 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Fri, 7 May 2021 10:47:28 +0200
Subject: [PATCH 3/6] chore: update deprecated SonarQube properties. GNP-6039.
---
gradle.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index defb0116..a8e36b70 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,6 +4,6 @@ systemProp.sonar.sources=frontend/src
systemProp.sonar.language=typescript
systemProp.sonar.scm.provider=git
systemProp.sonar.typescript.tsconfigPath=frontend/tsconfig.json
-systemProp.sonar.typescript.lcov.reportPaths=frontend/coverage/lcov.info
-systemProp.sonar.typescript.node=/tmp/node/node
+systemProp.sonar.javascript.lcov.reportPaths=frontend/coverage/lcov.info
+systemProp.sonar.nodejs.executable=/tmp/node/node
systemProp.sonar.typescript.exclusions=**/*.spec.ts
--
GitLab
From 842e86cee9bd9e45ae681106f91cc684745dceba Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Fri, 7 May 2021 14:22:15 +0200
Subject: [PATCH 4/6] chore: add sonarqube properties to import the project
from GitLab to SonarQube. GNP-6039. GNP-5961.
---
build.gradle.kts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/build.gradle.kts b/build.gradle.kts
index 085e086e..693feff6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,10 @@
plugins {
id("org.sonarqube") version "3.2.0"
}
+
+sonarqube {
+ properties {
+ property "sonar.projectKey", "urgi-is_faidare_AXlGu_BxPgTGgvpuDgeB"
+ property "sonar.qualitygate.wait", false
+ }
+}
--
GitLab
From 6c0488c689b6a611c6a36d14d307405b6f6b4c28 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Fri, 7 May 2021 14:28:43 +0200
Subject: [PATCH 5/6] chore: add parenthesis around properties. GNP-6039.
GNP-5961.
---
build.gradle.kts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index 693feff6..1ae02807 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
sonarqube {
properties {
- property "sonar.projectKey", "urgi-is_faidare_AXlGu_BxPgTGgvpuDgeB"
- property "sonar.qualitygate.wait", false
+ property ("sonar.projectKey", "urgi-is_faidare_AXlGu_BxPgTGgvpuDgeB")
+ property ("sonar.qualitygate.wait", false)
}
}
--
GitLab
From 47a2c24dd8bc7d89e32c65ca10acfad6a92f0321 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Fri, 7 May 2021 14:42:28 +0200
Subject: [PATCH 6/6] chore: add properties for SonarQube. GNP-6039. GNP-5961.
---
.gitlab-ci.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8f8f691..0758fa5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,7 +62,13 @@ test-and-sonarqube:
command: ["bin/elasticsearch", "-Ediscovery.type=single-node"]
variables:
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:
+ - .sonar/cache
script:
- ./gradlew :frontend:test --parallel
- ./gradlew :backend:test jacocoTestReport --parallel
--
GitLab