This commit is contained in:
parent
5b692612ae
commit
c47bdd6b9d
|
@ -100,6 +100,7 @@ pipeline {
|
|||
script {
|
||||
def packageJson = readJSON file: 'package.json'
|
||||
env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
|
||||
cleanDockerE2E()
|
||||
}
|
||||
sh 'rm -rf salix'
|
||||
sh 'git clone https://gitea.verdnatura.es/verdnatura/salix.git'
|
||||
|
@ -118,7 +119,6 @@ pipeline {
|
|||
}
|
||||
stage('Up Frontend') {
|
||||
steps {
|
||||
sh 'quasar build'
|
||||
sh 'docker-compose -f docker-compose.e2e.yml up -d --build front'
|
||||
}
|
||||
}
|
||||
|
@ -130,10 +130,7 @@ pipeline {
|
|||
}
|
||||
post {
|
||||
always {
|
||||
sh 'docker rm -f vn-database || true'
|
||||
sh 'docker rm -f salix_e2e || true'
|
||||
sh 'docker-compose -f docker-compose.e2e.yml down || true'
|
||||
|
||||
cleanDockerE2E()
|
||||
junit(
|
||||
testResults: 'junitresults.xml',
|
||||
allowEmptyResults: true
|
||||
|
@ -182,3 +179,11 @@ pipeline {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
def cleanDockerE2E() {
|
||||
script {
|
||||
sh 'docker rm -f vn-database || true'
|
||||
sh 'docker rm -f salix_e2e || true'
|
||||
sh 'docker-compose -f docker-compose.e2e.yml down || true'
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue