This commit is contained in:
Jamie Curnow 2023-03-08 13:10:43 +10:00
parent 6dfebf29ae
commit 2d9e617e49
No known key found for this signature in database
GPG key ID: FFBB624C43388E9E
2 changed files with 6 additions and 4 deletions

6
Jenkinsfile vendored
View file

@ -65,11 +65,14 @@ pipeline {
script { script {
// Frontend and Backend // Frontend and Backend
def shStatusCode = sh(label: 'Checking and Building', returnStatus: true, script: ''' def shStatusCode = sh(label: 'Checking and Building', returnStatus: true, script: '''
set +x # set +x
set -e
./scripts/ci/frontend-build > ${WORKSPACE}/tmp-sh-build 2>&1 ./scripts/ci/frontend-build > ${WORKSPACE}/tmp-sh-build 2>&1
./scripts/ci/test-and-build > ${WORKSPACE}/tmp-sh-build 2>&1 ./scripts/ci/test-and-build > ${WORKSPACE}/tmp-sh-build 2>&1
''') ''')
shOutput = readFile "${env.WORKSPACE}/tmp-sh-build" shOutput = readFile "${env.WORKSPACE}/tmp-sh-build"
echo "-->${shOutput}<--"
echo "-->${shStatusCode}<--"
if (shStatusCode != 0) { if (shStatusCode != 0) {
error "Error: ${shOutput}" error "Error: ${shOutput}"
} }
@ -86,6 +89,7 @@ pipeline {
} }
stage('Integration Tests Sqlite') { stage('Integration Tests Sqlite') {
steps { steps {
error "exiting for debug"
// Bring up a stack // Bring up a stack
sh 'docker-compose up -d fullstack-sqlite' sh 'docker-compose up -d fullstack-sqlite'
sh './scripts/wait-healthy $(docker-compose ps -q fullstack-sqlite) 120' sh './scripts/wait-healthy $(docker-compose ps -q fullstack-sqlite) 120'

View file

@ -1,6 +1,4 @@
#!/bin/bash #!/bin/bash -e
set +x
DOCKER_IMAGE=nginxproxymanager/nginx-full:certbot-node DOCKER_IMAGE=nginxproxymanager/nginx-full:certbot-node
docker pull "${DOCKER_IMAGE}" docker pull "${DOCKER_IMAGE}"