Skip to content

Commit 8f6b2b8

Browse files
authored
Revert "ci(jenkins): delegate docker setup to the preCommit step" (#559)
1 parent 1e0f26e commit 8f6b2b8

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

.ci/Jenkinsfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,21 @@ pipeline {
4747
stage('Sanity checks') {
4848
when {
4949
beforeAgent true
50-
not {
51-
changeRequest()
50+
anyOf {
51+
not { changeRequest() }
52+
expression { return params.Run_As_Master_Branch }
5253
}
5354
}
5455
steps {
5556
withGithubNotify(context: 'Sanity checks', tab: 'tests') {
5657
deleteDir()
5758
unstash 'source'
5859
script {
59-
dir(BASE_DIR){
60-
preCommit(commit: "${GIT_BASE_COMMIT}", junit: true, dockerImage: 'python:3.7-stretch')
60+
docker.image('python:3.7-stretch').inside("-e PATH=${PATH}:${env.WORKSPACE}/bin"){
61+
dir("${BASE_DIR}"){
62+
// registry: '' will help to disable the docker login
63+
preCommit(commit: "${GIT_BASE_COMMIT}", junit: true, registry: '')
64+
}
6165
}
6266
}
6367
}

.ci/linting.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ pipeline {
2525
steps {
2626
script {
2727
def sha = getGitCommitSha()
28-
preCommit(commit: "${sha}", junit: true, dockerImage: 'python:3.7-stretch')
28+
docker.image('python:3.7-stretch').inside("-e PATH=${PATH}:${env.WORKSPACE}/bin"){
29+
// registry: '' will help to disable the docker login
30+
preCommit(commit: "${sha}", junit: true, registry: '')
31+
}
2932
}
3033
}
3134
}

Jenkinsfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,21 @@ pipeline {
6161
stage('Sanity checks') {
6262
when {
6363
beforeAgent true
64-
not {
65-
changeRequest()
64+
anyOf {
65+
not { changeRequest() }
66+
expression { return params.Run_As_Master_Branch }
6667
}
6768
}
6869
steps {
6970
withGithubNotify(context: 'Sanity checks', tab: 'tests') {
7071
deleteDir()
7172
unstash 'source'
7273
script {
73-
dir(BASE_DIR){
74-
preCommit(commit: "${GIT_BASE_COMMIT}", junit: true, dockerImage: 'python:3.7-stretch')
74+
docker.image('python:3.7-stretch').inside("-e PATH=${PATH}:${env.WORKSPACE}/bin"){
75+
dir("${BASE_DIR}"){
76+
// registry: '' will help to disable the docker login
77+
preCommit(commit: "${GIT_BASE_COMMIT}", junit: true, registry: '')
78+
}
7579
}
7680
}
7781
}

0 commit comments

Comments
 (0)