Skip to content

Revert "ci(jenkins): delegate docker setup to the preCommit step" #559

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
merged 3 commits into from
Aug 14, 2019
Merged

Revert "ci(jenkins): delegate docker setup to the preCommit step" #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b468a38
Revert "ci(jenkins): delegate docker setup to the preCommit step (#557)"
v1v Aug 14, 2019
0220f8e
ci(jenkins): override registry params to ensure no docker login is do…
v1v Aug 14, 2019
401a329
ci(jenkins): enable to run the same stages in the PRs if required
v1v Aug 14, 2019
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
12 changes: 8 additions & 4 deletions .ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,21 @@ pipeline {
stage('Sanity checks') {
when {
beforeAgent true
not {
changeRequest()
anyOf {
not { changeRequest() }
expression { return params.Run_As_Master_Branch }
}
}
steps {
withGithubNotify(context: 'Sanity checks', tab: 'tests') {
deleteDir()
unstash 'source'
script {
dir(BASE_DIR){
preCommit(commit: "${GIT_BASE_COMMIT}", junit: true, dockerImage: 'python:3.7-stretch')
docker.image('python:3.7-stretch').inside("-e PATH=${PATH}:${env.WORKSPACE}/bin"){
dir("${BASE_DIR}"){
// registry: '' will help to disable the docker login
preCommit(commit: "${GIT_BASE_COMMIT}", junit: true, registry: '')
}
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion .ci/linting.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ pipeline {
steps {
script {
def sha = getGitCommitSha()
preCommit(commit: "${sha}", junit: true, dockerImage: 'python:3.7-stretch')
docker.image('python:3.7-stretch').inside("-e PATH=${PATH}:${env.WORKSPACE}/bin"){
// registry: '' will help to disable the docker login
preCommit(commit: "${sha}", junit: true, registry: '')
}
}
}
}
Expand Down
12 changes: 8 additions & 4 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,21 @@ pipeline {
stage('Sanity checks') {
when {
beforeAgent true
not {
changeRequest()
anyOf {
not { changeRequest() }
expression { return params.Run_As_Master_Branch }
}
}
steps {
withGithubNotify(context: 'Sanity checks', tab: 'tests') {
deleteDir()
unstash 'source'
script {
dir(BASE_DIR){
preCommit(commit: "${GIT_BASE_COMMIT}", junit: true, dockerImage: 'python:3.7-stretch')
docker.image('python:3.7-stretch').inside("-e PATH=${PATH}:${env.WORKSPACE}/bin"){
dir("${BASE_DIR}"){
// registry: '' will help to disable the docker login
preCommit(commit: "${GIT_BASE_COMMIT}", junit: true, registry: '')
}
}
}
}
Expand Down