Skip to content

Cherry-pick to 7.x: [CI] docker login for linux only (#24030) #24040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
v1v merged 1 commit into from
Feb 16, 2021
Merged

Cherry-pick to 7.x: [CI] docker login for linux only (#24030) #24040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,12 +877,14 @@ def dumpVariables(){
}

def isDockerInstalled(){
if (env?.NODE_LABELS?.toLowerCase().contains('macosx')) {
log(level: 'WARN', text: "Macosx workers require some docker-machine context. They are not used for anything related to docker stuff yet.")
return false
}
if (isUnix()) {
// TODO: some issues with macosx if(isInstalled(tool: 'docker', flag: '--version')) {
return sh(label: 'check for Docker', script: 'command -v docker', returnStatus: true) == 0
} else {
return false
}
return false
}

/**
Expand Down