[incubator-mxnet] branch master updated: CI: Prime docker cache in "Docker cache build" job (#18438)

[lausen]

This is an automated email from the ASF dual-hosted git repository.

lausen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/master by this push:
     new 2afd66a  CI: Prime docker cache in "Docker cache build" job (#18438)
2afd66a is described below

commit 2afd66af0559d0691b22068d8e3b929d92933cad
Author: Leonard Lausen <lau...@amazon.com>
AuthorDate: Fri May 29 20:05:31 2020 -0700

    CI: Prime docker cache in "Docker cache build" job (#18438)
    
    Cache priming was previously only handled when using the ./ci/build.py or
    ./ci/docker_cache.py script. The former is used during most CI jobs. The 
latter
    is used for containers not declared in docker-compose.yml during the "Docker
    cache build" job. More and more containers are declared in
    docker-compose.yml now, but prior to this commit their cache wasn't primed 
in the
    "Docker cache build" job.
---
 ci/Jenkinsfile_docker_cache     | 2 +-
 ci/jenkins/Jenkins_steps.groovy | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/Jenkinsfile_docker_cache b/ci/Jenkinsfile_docker_cache
index 2bf9040..96cf2c7 100644
--- a/ci/Jenkinsfile_docker_cache
+++ b/ci/Jenkinsfile_docker_cache
@@ -38,7 +38,7 @@ core_logic: {
         timeout(time: total_timeout, unit: 'MINUTES') {
           utils.init_git()
           sh "python3 ./ci/docker_cache.py --docker-registry 
${env.DOCKER_CACHE_REGISTRY}"
-          sh "cd ci && python3 ./docker_login.py --secret-name 
${env.DOCKERHUB_SECRET_NAME} && docker-compose -f docker/docker-compose.yml 
build --parallel && COMPOSE_HTTP_TIMEOUT=600 docker-compose -f 
docker/docker-compose.yml push && docker logout"
+          sh "cd ci && python3 ./docker_login.py --secret-name 
${env.DOCKERHUB_SECRET_NAME} && docker-compose -f docker/docker-compose.yml 
pull && docker-compose -f docker/docker-compose.yml build --parallel && 
COMPOSE_HTTP_TIMEOUT=600 docker-compose -f docker/docker-compose.yml push && 
docker logout"
         }
       }
     }
diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy
index 8c8e0da..83b2e01 100644
--- a/ci/jenkins/Jenkins_steps.groovy
+++ b/ci/jenkins/Jenkins_steps.groovy
@@ -1743,7 +1743,7 @@ def misc_test_docker_cache_build() {
       ws('workspace/docker_cache') {
         utils.init_git()
         sh "python3 ./ci/docker_cache.py --docker-registry 
${env.DOCKER_CACHE_REGISTRY} --no-publish"
-        sh "cd ci && docker-compose -f docker/docker-compose.yml build 
--parallel"
+        sh "cd ci && docker-compose -f docker/docker-compose.yml pull && 
docker-compose -f docker/docker-compose.yml build --parallel"
       }
     }
   }]