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

ci: refs #6695 streamline Cypress E2E test execution in Jenkinsfile and improve error handling
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Alex Moreno 2025-02-19 07:58:22 +01:00
parent 8bfe7211b0
commit 4b6784d732
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Jenkinsfile vendored
View File

@ -66,25 +66,25 @@ pipeline {
sh 'pnpm install --prefer-offline' sh 'pnpm install --prefer-offline'
} }
} }
stage('Test: Unit') { // stage('Test: Unit') {
when { // when {
expression { !PROTECTED_BRANCH } // expression { !PROTECTED_BRANCH }
} // }
environment { // environment {
NODE_ENV = "" // NODE_ENV = ""
} // }
steps { // steps {
sh 'pnpm run test:unit:ci' // sh 'pnpm run test:unit:ci'
} // }
post { // post {
always { // always {
junit( // junit(
testResults: 'junitresults.xml', // testResults: 'junitresults.xml',
allowEmptyResults: true // allowEmptyResults: true
) // )
} // }
} // }
} // }
stage('Test: E2E') { stage('Test: E2E') {
when { when {
expression { !PROTECTED_BRANCH } expression { !PROTECTED_BRANCH }
@ -170,14 +170,9 @@ pipeline {
def cleanDockerE2E() { def cleanDockerE2E() {
script { script {
def composeDown = sh(script: "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down", returnStatus: true) sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml down || true"
if (composeDown != 0) { if (containerId) {
echo "docker-compose down failed, but continuing..." sh "docker rm ${containerId} || true"
}
def removeContainer = sh(script: "docker rm ${containerId}", returnStatus: true)
if (removeContainer != 0) {
echo "Failed to remove container ${containerId}, it probably did not exist."
} }
} }
} }