verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 98 Releases Wiki Activity

ci: refs #6695 update Cypress setup in Jenkinsfile to streamline Docker commands
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Alex Moreno 2025-02-19 09:52:56 +01:00
parent 0b1ed3010f
commit 40c8daa2ab
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Jenkinsfile vendored
View File

@ -101,8 +101,8 @@ pipeline {
env.VERSION = "${packageJson.version}-build${env.BUILD_ID}" env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
env.NETWORK = "${PROJECT_NAME}-${env.BRANCH_NAME}-${env.BUILD_ID}" env.NETWORK = "${PROJECT_NAME}-${env.BRANCH_NAME}-${env.BUILD_ID}"
cleanDockerE2E() cleanDockerE2E()
sh "pnpm exec cypress install" // sh "pnpm exec cypress install"
sh "docker build -t cypress-setup:latest -f ./test/cypress/Dockerfile ." // sh "docker build -t cypress-setup:latest -f ./test/cypress/Dockerfile ."
docker.build('cypress-setup:latest', "-f ./test/cypress/Dockerfile .") docker.build('cypress-setup:latest', "-f ./test/cypress/Dockerfile .")
} }
@ -113,8 +113,8 @@ pipeline {
script { script {
sh "docker-compose -p ${env.NETWORK} -f 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 networkLowerCase = env.NETWORK.toLowerCase()
def containerId = sh(script: """ sh """
docker run --name ${env.NETWORK}_cypress \ docker run -d --rm --name ${env.NETWORK}_cypress \
--network ${networkLowerCase}_default \ --network ${networkLowerCase}_default \
-e TZ=Europe/Madrid \ -e TZ=Europe/Madrid \
-e DOCKER=true \ -e DOCKER=true \
@ -123,7 +123,11 @@ pipeline {
-w /app \ -w /app \
cypress-setup \ cypress-setup \
pnpm exec cypress run --browser chromium pnpm exec cypress run --browser chromium
""", returnStdout: true).trim() """
// def containerId = sh(script: "docker ps -q -f name=${env.NETWORK}_cypress", returnStdout: true).trim()
// echo "Container ID: ${containerId}"
// checkErrors(containerId) // checkErrors(containerId)
} }
} }