From 5777c53fa367bfd0bb7410bd7c47e80be6503ebe Mon Sep 17 00:00:00 2001
From: Tobias Bruns <kontakt@tobias-bruns.de>
Date: Fri, 17 Jan 2025 14:29:42 +0100
Subject: [PATCH 1/4] OZG-6238 run tests parallel
---
alfa-client/package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/alfa-client/package.json b/alfa-client/package.json
index 56791618d0..0e9fb56367 100644
--- a/alfa-client/package.json
+++ b/alfa-client/package.json
@@ -20,8 +20,8 @@
"ci-build-admin": "nx container admin",
"ci-prodBuild": "nx run alfa:build --outputHashing=all --configuration production",
"ci-prodBuild-admin": "nx container admin",
- "ci-test": "nx run-many --target=test --parallel 20 -- --runInBand",
- "ci-sonar": "nx run-many --target=test --parallel 20 -- --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && pnpm exec sonar-scanner",
+ "ci-test": "nx run-many --target=test -- --runInBand",
+ "ci-sonar": "nx run-many --target=test -- --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && pnpm exec sonar-scanner",
"lint": "nx workspace-lint && nx lint",
"affected:apps": "nx affected:apps",
"affected:libs": "nx affected:libs",
--
GitLab
From d816bf8d97e51d4546ad7667e331018f18a792c0 Mon Sep 17 00:00:00 2001
From: Tobias Bruns <kontakt@tobias-bruns.de>
Date: Fri, 17 Jan 2025 14:53:44 +0100
Subject: [PATCH 2/4] OZG-6238 readd parallel but without limiting threads
---
alfa-client/package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/alfa-client/package.json b/alfa-client/package.json
index 0e9fb56367..1f72c55a68 100644
--- a/alfa-client/package.json
+++ b/alfa-client/package.json
@@ -20,8 +20,8 @@
"ci-build-admin": "nx container admin",
"ci-prodBuild": "nx run alfa:build --outputHashing=all --configuration production",
"ci-prodBuild-admin": "nx container admin",
- "ci-test": "nx run-many --target=test -- --runInBand",
- "ci-sonar": "nx run-many --target=test -- --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && pnpm exec sonar-scanner",
+ "ci-test": "nx run-many --target=test --parallel -- --runInBand",
+ "ci-sonar": "nx run-many --target=test --parallel -- --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && pnpm exec sonar-scanner",
"lint": "nx workspace-lint && nx lint",
"affected:apps": "nx affected:apps",
"affected:libs": "nx affected:libs",
--
GitLab
From 750039d3e3cb3ae25b173c0752a1a8db310ba23b Mon Sep 17 00:00:00 2001
From: Tobias Bruns <kontakt@tobias-bruns.de>
Date: Fri, 17 Jan 2025 15:53:30 +0100
Subject: [PATCH 3/4] OZG-6238 remove network concurrency
---
alfa-client/apps/alfa/Jenkinsfile | 2 +-
alfa-client/package.json | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/alfa-client/apps/alfa/Jenkinsfile b/alfa-client/apps/alfa/Jenkinsfile
index 0dde2edb6c..1464cec669 100644
--- a/alfa-client/apps/alfa/Jenkinsfile
+++ b/alfa-client/apps/alfa/Jenkinsfile
@@ -78,7 +78,7 @@ pipeline {
sh 'node --version'
dir('alfa-client') {
- sh 'pnpm install --frozen-lockfile --network-concurrency=8'
+ sh 'pnpm install --frozen-lockfile'
if (isMainBranch()) {
withSonarQubeEnv('sonarqube-ozg-sh'){
diff --git a/alfa-client/package.json b/alfa-client/package.json
index 1f72c55a68..56791618d0 100644
--- a/alfa-client/package.json
+++ b/alfa-client/package.json
@@ -20,8 +20,8 @@
"ci-build-admin": "nx container admin",
"ci-prodBuild": "nx run alfa:build --outputHashing=all --configuration production",
"ci-prodBuild-admin": "nx container admin",
- "ci-test": "nx run-many --target=test --parallel -- --runInBand",
- "ci-sonar": "nx run-many --target=test --parallel -- --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && pnpm exec sonar-scanner",
+ "ci-test": "nx run-many --target=test --parallel 20 -- --runInBand",
+ "ci-sonar": "nx run-many --target=test --parallel 20 -- --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && pnpm exec sonar-scanner",
"lint": "nx workspace-lint && nx lint",
"affected:apps": "nx affected:apps",
"affected:libs": "nx affected:libs",
--
GitLab
From 4479c31e83f7081c19d213288b26897186f8a47c Mon Sep 17 00:00:00 2001
From: Tobias Bruns <kontakt@tobias-bruns.de>
Date: Fri, 17 Jan 2025 16:03:05 +0100
Subject: [PATCH 4/4] OZG-6238 remove limitation
---
alfa-client/apps/admin/Jenkinsfile | 2 +-
alfa-client/apps/info/Jenkinsfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/alfa-client/apps/admin/Jenkinsfile b/alfa-client/apps/admin/Jenkinsfile
index 466c2b7d22..8ae0ccfcdb 100644
--- a/alfa-client/apps/admin/Jenkinsfile
+++ b/alfa-client/apps/admin/Jenkinsfile
@@ -72,7 +72,7 @@ pipeline {
withNPM(npmrcConfig: 'npm-nexus-auth') {
dir('alfa-client') {
- sh 'pnpm install --frozen-lockfile --network-concurrency=8'
+ sh 'pnpm install --frozen-lockfile'
if (isReleaseBranch()) {
sh 'pnpm run ci-prodBuild-admin'
diff --git a/alfa-client/apps/info/Jenkinsfile b/alfa-client/apps/info/Jenkinsfile
index dd670c3260..e8c582e1e0 100644
--- a/alfa-client/apps/info/Jenkinsfile
+++ b/alfa-client/apps/info/Jenkinsfile
@@ -46,7 +46,7 @@ pipeline {
FAILED_STAGE = env.STAGE_NAME
dir('alfa-client') {
withNPM(npmrcConfig: 'npm-nexus-auth') {
- sh 'pnpm install --frozen-lockfile --network-concurrency=8'
+ sh 'pnpm install --frozen-lockfile'
sh 'pnpm exec nx run info:test'
sh 'pnpm exec nx run info:test -- --runInBand --codeCoverage --coverageReporters=lcov --testResultsProcessor=jest-sonar-reporter && pnpm exec sonar-scanner'
--
GitLab