From 536eb5996e7f5adc955df1cb81e5935d306d8380 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 19 Feb 2025 12:17:45 +0100 Subject: [PATCH] ci: refs #6695 refactor Cypress setup in Jenkinsfile and replace local docker-compose with new configuration --- Jenkinsfile | 4 ++-- test/cypress/docker-compose.e2e.yml => docker-compose.e2e.yml | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename test/cypress/docker-compose.e2e.yml => docker-compose.e2e.yml (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 39313092f24..6979b0c08cc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -100,7 +100,7 @@ pipeline { env.NETWORK = "${PROJECT_NAME}-${env.BRANCH_NAME}-${env.BUILD_ID}" docker.build('cypress-setup:latest', "-f ./test/cypress/Dockerfile .") - sh "docker-compose -p ${env.NETWORK} -f test/cypress/docker-compose.e2e.yml up -d" + sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d" def networkLowerCase = env.NETWORK.toLowerCase() def image = docker.image('cypress-setup', , "-f ./test/cypress/Dockerfile .") image.inside(""" @@ -113,7 +113,7 @@ pipeline { """) { sh 'pnpm exec cypress run --browser chromium' } - sh "docker-compose -p ${env.NETWORK} -f test/cypress/docker-compose.e2e.yml down" + sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down" } } } diff --git a/test/cypress/docker-compose.e2e.yml b/docker-compose.e2e.yml similarity index 100% rename from test/cypress/docker-compose.e2e.yml rename to docker-compose.e2e.yml