Skip to content

Commit

Permalink
fix: disable workaround on macos (elastic#17750)
Browse files Browse the repository at this point in the history
* fix: disable workaround on macos

* Update Jenkinsfile

Co-Authored-By: Victor Martinez <victormartinezrubio@gmail.com>

* Update Jenkinsfile

Co-Authored-By: Andrew Kroh <andrew.kroh@elastic.co>

Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com>
Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
  • Loading branch information
3 people authored Apr 17, 2020
1 parent 6ee548e commit 332b850
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,15 @@ def withBeatsEnv(boolean archive, Closure body) {
]) {
deleteDir()
unstash 'source'
dockerLogin(secret: "${DOCKERELASTIC_SECRET}", registry: "${DOCKER_REGISTRY}")
// FIXME workaround untill we fix the packer cache
sh 'docker pull docker.elastic.co/observability-ci/database-enterprise:12.2.0.1'
if(os == 'linux'){
dockerLogin(secret: "${DOCKERELASTIC_SECRET}", registry: "${DOCKER_REGISTRY}")
// FIXME workaround until we fix the packer cache
// Retry to avoid DDoS detection from the server
retry(3) {
sleep randomNumber(min: 2, max: 5)
sh 'docker pull docker.elastic.co/observability-ci/database-enterprise:12.2.0.1'
}
}
dir("${env.BASE_DIR}") {
sh(label: "Install Go ${GO_VERSION}", script: ".ci/scripts/install-go.sh")
sh(label: "Install docker-compose ${DOCKER_COMPOSE_VERSION}", script: ".ci/scripts/install-docker-compose.sh")
Expand Down

0 comments on commit 332b850

Please sign in to comment.