From 08aaa37ee4b28e0d76c520c5811e05099532d660 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Mon, 23 Nov 2020 14:28:19 +0100
Subject: [PATCH 01/13] chore: updated package list. GNP-5961.
---
frontend/package.json | 1 -
1 file changed, 1 deletion(-)
diff --git a/frontend/package.json b/frontend/package.json
index 58f4b9a5..ede9a6cc 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -61,7 +61,6 @@
"karma-jasmine": "3.1.1",
"karma-jasmine-html-reporter": "1.5.3",
"karma-junit-reporter": "2.0.1",
- "ngx-speculoos": "3.0.0",
"ngx-speculoos": "1.1.0",
"protractor": "5.4.1",
"ts-node": "7.0.1",
--
GitLab
From 4dda34b71db230ad664ec2d829189fd3968e3176 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Mon, 23 Nov 2020 14:28:59 +0100
Subject: [PATCH 02/13] feat: add dynamic branch name to sonar analysis step.
GNP-5961.
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eccc3a37..390cdb6a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,7 +66,7 @@ test-and-sonarqube:
- ./gradlew :backend:test --parallel
- find /tmp/node/*/bin -name node -exec ln -s {} /tmp/node/node \;
- export PATH="/tmp/node/:$PATH"
- - ./gradlew sonarqube -x test
+ - ./gradlew sonarqube -x test -Dsonar.branch.name=$CI_COMMIT_REF_NAME
artifacts:
reports:
junit:
--
GitLab
From 05d4e6a8f503478da251927a96038be6414eb3cb Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Mon, 23 Nov 2020 14:44:06 +0100
Subject: [PATCH 03/13] chore: upgrage ngx-speculoos to version 3.0.0.
GNP-5961.
---
frontend/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/package.json b/frontend/package.json
index ede9a6cc..d891a48f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -61,7 +61,7 @@
"karma-jasmine": "3.1.1",
"karma-jasmine-html-reporter": "1.5.3",
"karma-junit-reporter": "2.0.1",
- "ngx-speculoos": "1.1.0",
+ "ngx-speculoos": "3.0.0",
"protractor": "5.4.1",
"ts-node": "7.0.1",
"tslint": "5.11.0",
--
GitLab
From 6ec75456085463d3faf7fbf38f5a252b73763ca8 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Mon, 23 Nov 2020 14:52:58 +0100
Subject: [PATCH 04/13] chore: downgrade ngx-speculoos to version 1.1.0.
GNP-5961.
---
frontend/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/package.json b/frontend/package.json
index d891a48f..ede9a6cc 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -61,7 +61,7 @@
"karma-jasmine": "3.1.1",
"karma-jasmine-html-reporter": "1.5.3",
"karma-junit-reporter": "2.0.1",
- "ngx-speculoos": "3.0.0",
+ "ngx-speculoos": "1.1.0",
"protractor": "5.4.1",
"ts-node": "7.0.1",
"tslint": "5.11.0",
--
GitLab
From e72dfe9308e9bfcea7f1a4ab5cc875b585f47f33 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Tue, 24 Nov 2020 15:03:23 +0100
Subject: [PATCH 05/13] feat: add sonarqube environment variables. GNP-5961.
---
.gitlab-ci.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 390cdb6a..f8c73347 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,6 +61,8 @@ test-and-sonarqube:
command: ["bin/elasticsearch", "-Ediscovery.type=single-node"]
variables:
GRADLE_OPTS: "-Dorg.gradle.daemon=true"
+ SONAR_TOKEN: "94f359749d72f13d1e1a407521a8dd57c71ba562"
+ SONAR_HOST_URL: "https://urgi.versailles.inrae.fr/sonarqube"
script:
- ./gradlew :frontend:test --parallel
- ./gradlew :backend:test --parallel
@@ -72,6 +74,8 @@ test-and-sonarqube:
junit:
- ./backend/build/test-results/test/TEST-*.xml
- ./frontend/karma-junit-tests-report/TEST*.xml
+ only:
+ - merge_requests
# BUILD
--
GitLab
From 3bbdd4911e29a8bdbbfc6214f367609cf03b3267 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Tue, 24 Nov 2020 15:22:47 +0100
Subject: [PATCH 06/13] feat: add pullrequest sonarqube properties. GNP-5961.
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8c73347..d1b5234f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,7 +68,7 @@ test-and-sonarqube:
- ./gradlew :backend:test --parallel
- find /tmp/node/*/bin -name node -exec ln -s {} /tmp/node/node \;
- export PATH="/tmp/node/:$PATH"
- - ./gradlew sonarqube -x test -Dsonar.branch.name=$CI_COMMIT_REF_NAME
+ - ./gradlew sonarqube -x test -Dsonar.branch.name=$CI_COMMIT_REF_NAME -Dsonar.pullrequest.key=$CI_MERGE_REQUEST_ID -Dsonar.pullrequest.branch=$CI_COMMIT_REF_NAME
artifacts:
reports:
junit:
--
GitLab
From 07c998e34cf649ce15756d1121f559e4f084893d Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Tue, 24 Nov 2020 15:33:18 +0100
Subject: [PATCH 07/13] feat: remove sonar.branch.name property. GNP-5961.
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1b5234f..73dc7444 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,7 +68,7 @@ test-and-sonarqube:
- ./gradlew :backend:test --parallel
- find /tmp/node/*/bin -name node -exec ln -s {} /tmp/node/node \;
- export PATH="/tmp/node/:$PATH"
- - ./gradlew sonarqube -x test -Dsonar.branch.name=$CI_COMMIT_REF_NAME -Dsonar.pullrequest.key=$CI_MERGE_REQUEST_ID -Dsonar.pullrequest.branch=$CI_COMMIT_REF_NAME
+ - ./gradlew sonarqube -x test -Dsonar.pullrequest.key=$CI_MERGE_REQUEST_ID -Dsonar.pullrequest.branch=$CI_COMMIT_REF_NAME
artifacts:
reports:
junit:
--
GitLab
From 8f83264bca03a2584bce95ca23004a2af937be8d Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Tue, 24 Nov 2020 15:54:30 +0100
Subject: [PATCH 08/13] feat: add GIT_DEPTH variable to avoid git shallow
clone. GNP-5961.
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73dc7444..d26b726f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,7 @@ variables:
GRADLE_USER_HOME: $CI_PROJECT_DIR/.gradle
APP_NAME: faidare
JAR_PATH: "backend/build/libs/${APP_NAME}.jar"
+ GIT_DEPTH: 1000
# Gradle cache for all jobs
--
GitLab
From 2c71cbe304e9aa8bcc5340be62e085e955562514 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Wed, 25 Nov 2020 12:00:41 +0100
Subject: [PATCH 09/13] chore: remove sonar token and URL et set it in GitLab
variables. GNP-5961.
---
.gitlab-ci.yml | 6 +++---
gradle.properties | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d26b726f..a9ec7f9d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
GRADLE_USER_HOME: $CI_PROJECT_DIR/.gradle
APP_NAME: faidare
JAR_PATH: "backend/build/libs/${APP_NAME}.jar"
- GIT_DEPTH: 1000
+ GIT_DEPTH: 0
# Gradle cache for all jobs
@@ -62,8 +62,8 @@ test-and-sonarqube:
command: ["bin/elasticsearch", "-Ediscovery.type=single-node"]
variables:
GRADLE_OPTS: "-Dorg.gradle.daemon=true"
- SONAR_TOKEN: "94f359749d72f13d1e1a407521a8dd57c71ba562"
- SONAR_HOST_URL: "https://urgi.versailles.inrae.fr/sonarqube"
+ #SONAR_TOKEN: "94f359749d72f13d1e1a407521a8dd57c71ba562"
+ #SONAR_HOST_URL: "https://urgi.versailles.inrae.fr/sonarqube"
script:
- ./gradlew :frontend:test --parallel
- ./gradlew :backend:test --parallel
diff --git a/gradle.properties b/gradle.properties
index 4ce5f430..a66c584e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
# gradle.properties
-systemProp.sonar.host.url=https://urgi.versailles.inrae.fr/sonarqube
+#systemProp.sonar.host.url=https://urgi.versailles.inrae.fr/sonarqube
#----- Token generated from an account with 'publish analysis' permission
-systemProp.sonar.login=94f359749d72f13d1e1a407521a8dd57c71ba562
+#systemProp.sonar.login=94f359749d72f13d1e1a407521a8dd57c71ba562
systemProp.sonar.sources=frontend/src
systemProp.sonar.language=typescript
--
GitLab
From 7a88ce1385aac8b0db40edea5f5b60a1168e79da Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Wed, 25 Nov 2020 12:09:03 +0100
Subject: [PATCH 10/13] chore: remove commented variables. GNP-5961.
---
.gitlab-ci.yml | 2 --
gradle.properties | 4 ----
2 files changed, 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a9ec7f9d..dda3c7d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,8 +62,6 @@ test-and-sonarqube:
command: ["bin/elasticsearch", "-Ediscovery.type=single-node"]
variables:
GRADLE_OPTS: "-Dorg.gradle.daemon=true"
- #SONAR_TOKEN: "94f359749d72f13d1e1a407521a8dd57c71ba562"
- #SONAR_HOST_URL: "https://urgi.versailles.inrae.fr/sonarqube"
script:
- ./gradlew :frontend:test --parallel
- ./gradlew :backend:test --parallel
diff --git a/gradle.properties b/gradle.properties
index a66c584e..defb0116 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,4 @@
# gradle.properties
-#systemProp.sonar.host.url=https://urgi.versailles.inrae.fr/sonarqube
-
-#----- Token generated from an account with 'publish analysis' permission
-#systemProp.sonar.login=94f359749d72f13d1e1a407521a8dd57c71ba562
systemProp.sonar.sources=frontend/src
systemProp.sonar.language=typescript
--
GitLab
From 1ebbd8f65808cb50fa6212efa03cf4ddb8565d44 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Wed, 25 Nov 2020 12:30:11 +0100
Subject: [PATCH 11/13] chore: add frontend/package-lock.json to ignored files.
GNP-5961.
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index c456a808..0648667b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -269,3 +269,4 @@ gradle-app.setting
**/build/
# End of https://www.gitignore.io/api/gradle,eclipse,intellij,visualstudiocode,kotlin,git,macos,linux
+frontend/package-lock.json
--
GitLab
From 51393a1a0cb66a05111b2352d35ed410ee34aaa7 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Wed, 25 Nov 2020 15:51:55 +0100
Subject: [PATCH 12/13] feat: create test-and-sonarqube-master job which
extends test-and-sonarqube in order to run on master branch. GNP-5961.
---
.gitlab-ci.yml | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dda3c7d5..9155ac05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,12 +62,13 @@ test-and-sonarqube:
command: ["bin/elasticsearch", "-Ediscovery.type=single-node"]
variables:
GRADLE_OPTS: "-Dorg.gradle.daemon=true"
+ 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
- find /tmp/node/*/bin -name node -exec ln -s {} /tmp/node/node \;
- export PATH="/tmp/node/:$PATH"
- - ./gradlew sonarqube -x test -Dsonar.pullrequest.key=$CI_MERGE_REQUEST_ID -Dsonar.pullrequest.branch=$CI_COMMIT_REF_NAME
+ - ./gradlew sonarqube -x test $SONAR_BRANCH_OPTS
artifacts:
reports:
junit:
@@ -77,6 +78,15 @@ test-and-sonarqube:
- merge_requests
+test-and-sonarqube-master:
+ extends: test-and-sonarqube
+ variables:
+ SONAR_BRANCH_OPTS: ""
+ only:
+ refs:
+ - master
+
+
# BUILD
--
GitLab
From 03465182e00db4c0838fa364fe66fedda6db1cd0 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Fri, 27 Nov 2020 10:24:41 +0100
Subject: [PATCH 13/13] chore: add refs subsection to only section for
test-and-sonarqube job. GNP-5961.
---
.gitlab-ci.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9155ac05..934fab5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,7 +75,8 @@ test-and-sonarqube:
- ./backend/build/test-results/test/TEST-*.xml
- ./frontend/karma-junit-tests-report/TEST*.xml
only:
- - merge_requests
+ refs:
+ - merge_requests
test-and-sonarqube-master:
--
GitLab