From 9ffbf582ffd0b5642d5aef91a09b31c1309597e8 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Tue, 14 Mar 2023 15:29:57 +0100
Subject: [PATCH 1/4] chore: remove --parallel option. GNP-6342.

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 452d8242..72ecf743 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,7 +90,7 @@ test-and-sonarqube:
       - ".gradle"
       - .sonar/cache
   script:
-    - ./gradlew test jacocoTestReport --parallel
+    - ./gradlew test jacocoTestReport
     # disable sonarqube because it apparently needs node, but I don't know why, and it can't find it anymore now that
     # there is no frontend project anymore, and it takes sooooo much time to complete anyway for results that nobody
     # will ever look
-- 
GitLab


From 4995458990e1af42035445a8acd5bb6c28e34584 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Tue, 14 Mar 2023 15:50:55 +0100
Subject: [PATCH 2/4] chore: pull script lines. GNP-6342.

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72ecf743..877d85c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -90,11 +90,11 @@ test-and-sonarqube:
       - ".gradle"
       - .sonar/cache
   script:
-    - ./gradlew test jacocoTestReport
+    - ./gradlew test jacocoTestReport -s sonarqube
     # disable sonarqube because it apparently needs node, but I don't know why, and it can't find it anymore now that
     # there is no frontend project anymore, and it takes sooooo much time to complete anyway for results that nobody
     # will ever look
-    - ./gradlew -s sonarqube -x test --parallel
+    #- ./gradlew -s sonarqube -x test --parallel
   artifacts:
     reports:
       junit:
-- 
GitLab


From 494f37a76b52bda017f52bf86422709fafda0603 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Wed, 15 Mar 2023 11:21:06 +0100
Subject: [PATCH 3/4] chore: remove commented lines. GNP-6342.

---
 .gitlab-ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 877d85c6..68848d9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,10 +91,6 @@ test-and-sonarqube:
       - .sonar/cache
   script:
     - ./gradlew test jacocoTestReport -s sonarqube
-    # disable sonarqube because it apparently needs node, but I don't know why, and it can't find it anymore now that
-    # there is no frontend project anymore, and it takes sooooo much time to complete anyway for results that nobody
-    # will ever look
-    #- ./gradlew -s sonarqube -x test --parallel
   artifacts:
     reports:
       junit:
-- 
GitLab


From cb513e340bb03788821d3c5bc857dbb1abe84ef4 Mon Sep 17 00:00:00 2001
From: Erik Kimmel <erik.kimmel@inrae.fr>
Date: Tue, 16 May 2023 10:43:47 +0200
Subject: [PATCH 4/4] fix: add memory options for gradle. GNP-6342.

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68848d9f..55cc1ad5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,7 +79,7 @@ test-and-sonarqube:
       # `max virtual memory areas vm.max_map_count [65530] is too low, increase to at least [262144]`
       command: ["bin/elasticsearch", "-Ediscovery.type=single-node"]
   variables:
-    GRADLE_OPTS: "-Dorg.gradle.daemon=true"
+    GRADLE_OPTS: "-Xms512m -Xmx8192m -XX:MaxMetaspaceSize=8192m -Dorg.gradle.daemon=false"
     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
     ES_JAVA_OPTS: "-Xms2g -Xmx2g"
-- 
GitLab