ci(jenkins): delegate docker setup to the preCommit step (#557)

elastic · Aug 14, 2019 · b4fc446 · b4fc446
1 parent 63ce779
commit b4fc446
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -56,10 +56,8 @@ pipeline {
               deleteDir()
               unstash 'source'
               script {
-                docker.image('python:3.7-stretch').inside("-e PATH=${PATH}:${env.WORKSPACE}/bin"){
-                  dir("${BASE_DIR}"){
-                    preCommit(commit: "${GIT_BASE_COMMIT}", junit: true)
-                  }
+                dir(BASE_DIR){
+                  preCommit(commit: "${GIT_BASE_COMMIT}", junit: true, dockerImage: 'python:3.7-stretch')
                 }
               }
             }

diff --git a/.ci/linting.groovy b/.ci/linting.groovy
@@ -25,9 +25,7 @@ pipeline {
       steps {
         script {
           def sha = getGitCommitSha()
-          docker.image('python:3.7-stretch').inside("-e PATH=${PATH}:${env.WORKSPACE}/bin"){
-            preCommit(commit: "${sha}", junit: true)
-          }
+          preCommit(commit: "${sha}", junit: true, dockerImage: 'python:3.7-stretch')
         }
       }
     }