Skip to content

Commit 7322d35

Browse files
committedOct 13, 2024
Fix CI
1 parent 81b8918 commit 7322d35

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed
 

‎Jenkinsfile

+1-8
Original file line numberDiff line numberDiff line change
@@ -204,20 +204,13 @@ pipeline {
204204
always {
205205
sh 'echo Reverting ownership'
206206
sh 'docker run --rm -v "$(pwd):/data" jc21/ci-tools chown -R "$(id -u):$(id -g)" /data'
207-
}
208-
success {
209-
juxtapose event: 'success'
210-
sh 'figlet "SUCCESS"'
207+
printResult(true)
211208
}
212209
failure {
213210
archiveArtifacts(artifacts: 'debug/**/*.*', allowEmptyArchive: true)
214-
juxtapose event: 'failure'
215-
sh 'figlet "FAILURE"'
216211
}
217212
unstable {
218213
archiveArtifacts(artifacts: 'debug/**/*.*', allowEmptyArchive: true)
219-
juxtapose event: 'unstable'
220-
sh 'figlet "UNSTABLE"'
221214
}
222215
}
223216
}

‎scripts/ci/fulltest-cypress

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ rm -rf "${LOCAL_RESOLVE}"
6565
printf "nameserver %s\noptions ndots:0" "${DNSROUTER_IP}" > "${LOCAL_RESOLVE}"
6666

6767
# bring up all remaining containers, except cypress!
68-
docker-compose up -d --remove-orphans stepca
68+
docker-compose up -d --remove-orphans stepca squid
6969
docker-compose pull db-mysql || true # ok to fail
7070
docker-compose up -d --remove-orphans --pull=never fullstack
7171

0 commit comments

Comments
 (0)