fix: disable workaround on macos #17750
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
v1v
reviewed
Apr 16, 2020
| 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'){ |
There was a problem hiding this comment.
I didn't now os was a filter, neat!
There was a problem hiding this comment.
well, it is a tricky function we have in the pipeline of beats, probably we can move it to the library.
v1v
reviewed
Apr 16, 2020
v1v
approved these changes
Apr 16, 2020
Co-Authored-By: Victor Martinez <victormartinezrubio@gmail.com>
andrewkroh
approved these changes
Apr 16, 2020
cachedout
approved these changes
Apr 16, 2020
mdelapenya
approved these changes
Apr 16, 2020
andrewkroh
reviewed
Apr 16, 2020
Co-Authored-By: Andrew Kroh <andrew.kroh@elastic.co>
jsoriano
pushed a commit
to jsoriano/beats
that referenced
this pull request
Apr 28, 2020
* 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>
jsoriano
added a commit
that referenced
this pull request
Apr 28, 2020
Backport some features added to Jenkinsfile to 7.x branch: * Dry run option. * Docker login. * Git config for generator tests. * Filter changes using go list. These are the cherry-picked changes: * fix: login into the docker registry (#17620) * feat: filter changes using go list output (#17397) * fix: disable workaround on macos (#17750) * ci: set git user configuration if it is not set (#17782) * fix: mount Docker credentials (#17798) * Review dependency patterns collection in Jenkins (#18004) Co-authored-by: Ivan Fernandez Calvo <kuisathaverat@users.noreply.github.com> Co-authored-by: Victor Martinez <victormartinezrubio@gmail.com> Co-authored-by: Andrew Kroh <andrew.kroh@elastic.co>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
It disables docker login and a workaround to pull a Docker image on Mac OS.
Why is it important?
Mac OS workers do not have Docker installed so the commands fail, breaking the build.