From 2b9d03c3c50d7d6c4c42ffd64f74d8ef8c5131af Mon Sep 17 00:00:00 2001
From: Antoine Lambert <anlambert@softwareheritage.org>
Date: Mon, 31 Oct 2022 15:32:31 +0100
Subject: [PATCH] Revert "templates/stage-cypress-tests: Prevent race condition
with support file"
This reverts commit a0fd3dc0fe5913335bfe294b6470e46836e97287 as that fix
does not work since the issue it aimed to fix can still happen when
running cypress tests in parallel on Jenkins.
---
jobs/templates/includes/stage-cypress-tests.groovy.j2 | 5 -----
1 file changed, 5 deletions(-)
diff --git a/jobs/templates/includes/stage-cypress-tests.groovy.j2 b/jobs/templates/includes/stage-cypress-tests.groovy.j2
index cee01a5..69108b3 100644
--- a/jobs/templates/includes/stage-cypress-tests.groovy.j2
+++ b/jobs/templates/includes/stage-cypress-tests.groovy.j2
@@ -74,11 +74,6 @@ stage('Cypress tests') {
# copy database file to the one that will be used by django for that test runner
cp swh-web-test.sqlite3 swh-web-test{{ n }}.sqlite3
- # prevent a race condition when multiple cypress processes load the same support file in parallel
- # as copy operations are performed
- cp cypress/support/e2e.js cypress/support/e2e{{ n }}.js
- sed -i "s/supportFile: 'cypress\\/support\\/e2e.js'/supportFile: 'cypress\\/support\\/e2e{{ n }}.js'/" cypress.config.js
-
# run django server on a dedicated port for that test runner and wait for it to be up
python3 swh/web/manage.py runserver --nostatic --settings=swh.web.settings.tests 0.0.0.0:500{{ n }}&
wait-for-it -t 90 localhost:500{{ n }}
--
GitLab