remove docker build in pre-merge [skip ci] (NVIDIA#1877)

* remove docker build in pre-merge Signed-off-by: Peixin Li <pxli@nyu.edu> * Revert "remove docker build in pre-merge" This reverts commit bbc9c5d. * add dockerfile-modified logic * make dockerfile location a var * use var in docker build
nartal1 · Mar 10, 2021 · a396966 · a396966
1 parent 5ddab56
commit a396966
Showing 1 changed file with 26 additions and 10 deletions.
diff --git a/jenkins/Jenkinsfile-blossom.premerge b/jenkins/Jenkinsfile-blossom.premerge
@@ -28,6 +28,8 @@ import ipp.blossom.*
 def pluginPremerge
 
 def githubHelper // blossom github helper
+def TEMP_IMAGE_BUILD = true
+def PREMERGE_DOCKERFILE = 'jenkins/Dockerfile-blossom.ubuntu16'
 def IMAGE_PREMERGE // temp image for premerge test
 def PREMERGE_TAG
 def skipped = false
@@ -118,16 +120,27 @@ pipeline {
                         def CUDA_NAME = sh(returnStdout: true,
                                 script: '. jenkins/version-def.sh>&2 && echo -n $CUDA_CLASSIFIER | sed "s/-/./g"')
 
-                        IMAGE_TAG = "dev-ubuntu16-${CUDA_NAME}"
-                        CACHE_IMAGE_NAME = "${ARTIFACTORY_NAME}/sw-spark-docker/plugin:${IMAGE_TAG}"
+                        // check if pre-merge dockerfile modified
+                        def dockerfileModified = sh(returnStdout: true,
+                                script: 'BASE=$(git --no-pager log --oneline -1 | awk \'{ print $NF }\'); ' +
+                                        'git --no-pager diff --name-only HEAD $(git merge-base HEAD $BASE) ' +
+                                        "-- ${PREMERGE_DOCKERFILE} || true")
+                        if (!dockerfileModified?.trim()) {
+                            TEMP_IMAGE_BUILD = false
+                        }
+
+                        if (TEMP_IMAGE_BUILD) {
+                            IMAGE_TAG = "dev-ubuntu16-${CUDA_NAME}"
+                            PREMERGE_TAG = "${IMAGE_TAG}-${BUILD_TAG}"
+                            IMAGE_PREMERGE = "${ARTIFACTORY_NAME}/sw-spark-docker-local/plugin:${PREMERGE_TAG}"
+                            def CUDA_VER = "$CUDA_NAME" - "cuda"
+                            docker.build(IMAGE_PREMERGE, "-f ${PREMERGE_DOCKERFILE} --build-arg CUDA_VER=$CUDA_VER -t $IMAGE_PREMERGE .")
+                            uploadDocker(IMAGE_PREMERGE)
+                        } else {
+                            // if no pre-merge dockerfile change, use nightly image
+                            IMAGE_PREMERGE = "$ARTIFACTORY_NAME/sw-spark-docker-local/plugin:dev-ubuntu16-$CUDA_NAME-blossom-dev"
+                        }
 
-                        sh "docker pull $CACHE_IMAGE_NAME || true"
-
-                        PREMERGE_TAG = "${IMAGE_TAG}-${BUILD_TAG}"
-                        IMAGE_PREMERGE = "${ARTIFACTORY_NAME}/sw-spark-docker-local/plugin:${PREMERGE_TAG}"
-                        def CUDA_VER = "$CUDA_NAME" - "cuda"
-                        docker.build(IMAGE_PREMERGE, "-f jenkins/Dockerfile-blossom.ubuntu16 --build-arg CUDA_VER=$CUDA_VER --cache-from $CACHE_IMAGE_NAME -t $IMAGE_PREMERGE .")
-                        uploadDocker(IMAGE_PREMERGE)
 
                         pluginPremerge = pod.getGPUYAML("${IMAGE_PREMERGE}", "${GPU_TYPE}", '8', '32Gi') // cpu: 8, memory: 32Gi
                     }
@@ -177,12 +190,15 @@ pipeline {
                     return
                 }
 
-                deleteDockerTempTag(PREMERGE_TAG) // clean premerge temp image
                 if (currentBuild.currentResult == "SUCCESS") {
                     githubHelper.updateCommitStatus("$BUILD_URL", "Success", GitHubCommitState.SUCCESS)
                 } else {
                     githubHelper.updateCommitStatus("$BUILD_URL", "Fail", GitHubCommitState.FAILURE)
                 }
+
+                if (TEMP_IMAGE_BUILD) {
+                    deleteDockerTempTag("${PREMERGE_TAG}") // clean premerge temp image
+                }
             }
         }
     }