[incubator-mxnet] branch master updated: [MXNET-849] - Enable armv7 with pinned docker images. (#12272)

[marcoabreu]

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

marcoabreu 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 e1b2265  [MXNET-849] - Enable armv7 with pinned docker images. (#12272)
e1b2265 is described below

commit e1b22657db52e2748fffd38900201c88f17b4734
Author: Kellen Sunderland <kellen.sunderl...@gmail.com>
AuthorDate: Thu Aug 23 13:13:46 2018 +0200

    [MXNET-849] - Enable armv7 with pinned docker images. (#12272)
    
    * Revert "Temporarily disable ARMv7 builds (#12260)"
    
    This reverts commit a4aced7123ba8aba13f0525276c909f4a78a04ee.
    
    * [MXNET-849] Pin armv7 dockcross image
    
    Co-authored-by: Anton Chernov <mecher...@gmail.com>
---
 Jenkinsfile                      | 20 ++++++++++----------
 ci/docker/Dockerfile.build.armv7 |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bbb4057..0e4aa19 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -363,16 +363,16 @@ core_logic: {
         }
       }
     },
-    // 'ARMv7':{
-    //   node(NODE_LINUX_CPU) {
-    //     ws('workspace/build-ARMv7') {
-    //       timeout(time: max_time, unit: 'MINUTES') {
-    //         utils.init_git()
-    //         utils.docker_run('armv7', 'build_armv7', false)
-    //       }
-    //     }
-    //   }
-    // },
+    'ARMv7':{
+      node(NODE_LINUX_CPU) {
+        ws('workspace/build-ARMv7') {
+          timeout(time: max_time, unit: 'MINUTES') {
+            utils.init_git()
+            utils.docker_run('armv7', 'build_armv7', false)
+          }
+        }
+      }
+    },
     'ARMv6':{
       node(NODE_LINUX_CPU) {
         ws('workspace/build-ARMv6') {
diff --git a/ci/docker/Dockerfile.build.armv7 b/ci/docker/Dockerfile.build.armv7
index 6316270..2ad3bea 100755
--- a/ci/docker/Dockerfile.build.armv7
+++ b/ci/docker/Dockerfile.build.armv7
@@ -18,7 +18,7 @@
 #
 # Dockerfile to build MXNet for Android ARMv7
 
-FROM dockcross/linux-armv7
+FROM mxnetci/dockcross-linux-armv7:08212018
 
 ENV ARCH armv7l
 ENV HOSTCC gcc