You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ke...@apache.org on 2018/11/26 01:37:16 UTC
[incubator-mxnet] branch master updated: Replace mxnetci dockcross
with public dockcross due to missing image (#13402)
This is an automated email from the ASF dual-hosted git repository.
kellen 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 b7b0d3f Replace mxnetci dockcross with public dockcross due to missing image (#13402)
b7b0d3f is described below
commit b7b0d3f52b7c55f02c76aa5cf969ce88419b267e
Author: Marco de Abreu <ma...@users.noreply.github.com>
AuthorDate: Mon Nov 26 02:37:00 2018 +0100
Replace mxnetci dockcross with public dockcross due to missing image (#13402)
* Replace mxnetci dockcross with public dockcross due to missing image
* Remove source lists change
* Disable Jetson
* Move to mxnetcipinned
---
Jenkinsfile | 20 ++++++++++----------
ci/docker/Dockerfile.build.android_armv7 | 2 +-
ci/docker/Dockerfile.build.android_armv8 | 2 +-
ci/docker/Dockerfile.build.armv6 | 2 +-
ci/docker/Dockerfile.build.armv7 | 2 +-
ci/docker/Dockerfile.build.armv8 | 6 +++---
ci/docker/Dockerfile.build.jetson | 6 +++---
ci/jenkins/Jenkinsfile_edge | 2 +-
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 79392b4..015ca81 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -428,16 +428,16 @@ core_logic: {
}
}
},
- 'NVidia Jetson / ARMv8':{
- node(NODE_LINUX_CPU) {
- ws('workspace/build-jetson-armv8') {
- timeout(time: max_time, unit: 'MINUTES') {
- utils.init_git()
- utils.docker_run('jetson', 'build_jetson', false)
- }
- }
- }
- },
+ //'NVidia Jetson / ARMv8':{
+ // node(NODE_LINUX_CPU) {
+ // ws('workspace/build-jetson-armv8') {
+ // timeout(time: max_time, unit: 'MINUTES') {
+ // utils.init_git()
+ // utils.docker_run('jetson', 'build_jetson', false)
+ // }
+ // }
+ // }
+ //},
'ARMv7':{
node(NODE_LINUX_CPU) {
ws('workspace/build-ARMv7') {
diff --git a/ci/docker/Dockerfile.build.android_armv7 b/ci/docker/Dockerfile.build.android_armv7
index 799e29c..c601fc5 100644
--- a/ci/docker/Dockerfile.build.android_armv7
+++ b/ci/docker/Dockerfile.build.android_armv7
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for Android ARMv7
-FROM mxnetci/dockcross-linux-base:08212018
+FROM mxnetcipinned/dockcross-base:11262018
MAINTAINER Pedro Larroy "pllarroy@amazon.com"
# The cross-compiling emulator
diff --git a/ci/docker/Dockerfile.build.android_armv8 b/ci/docker/Dockerfile.build.android_armv8
index 2c2c71c..60376b8 100644
--- a/ci/docker/Dockerfile.build.android_armv8
+++ b/ci/docker/Dockerfile.build.android_armv8
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for Android ARM64/ARMv8
-FROM mxnetci/dockcross-linux-base:08212018
+FROM mxnetcipinned/dockcross-base:11262018
MAINTAINER Pedro Larroy "pllarroy@amazon.com"
RUN apt-get update && apt-get install -y \
diff --git a/ci/docker/Dockerfile.build.armv6 b/ci/docker/Dockerfile.build.armv6
index 78071fa..6f16d8c 100644
--- a/ci/docker/Dockerfile.build.armv6
+++ b/ci/docker/Dockerfile.build.armv6
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for ARMv6
-FROM mxnetci/dockcross-linux-armv6:08212018
+FROM mxnetcipinned/dockcross-linux-armv6:11262018
ENV ARCH armv6l
ENV HOSTCC gcc
diff --git a/ci/docker/Dockerfile.build.armv7 b/ci/docker/Dockerfile.build.armv7
index 9a23a5d..5f02234 100644
--- a/ci/docker/Dockerfile.build.armv7
+++ b/ci/docker/Dockerfile.build.armv7
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for Android ARMv7
-FROM mxnetci/dockcross-linux-armv7:09182018
+FROM mxnetcipinned/dockcross-linux-armv7:11262018
ENV ARCH armv7l
ENV HOSTCC gcc
diff --git a/ci/docker/Dockerfile.build.armv8 b/ci/docker/Dockerfile.build.armv8
index 46cc229..27bd425 100644
--- a/ci/docker/Dockerfile.build.armv8
+++ b/ci/docker/Dockerfile.build.armv8
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for ARM64/ARMv8
-FROM mxnetci/dockcross-linux-arm64:08212018
+FROM mxnetcipinned/dockcross-linux-arm64:11262018
ENV ARCH aarch64
ENV HOSTCC gcc
@@ -27,8 +27,8 @@ ENV TARGET ARMV8
WORKDIR /work/deps
# gh issue #11567 https://github.com/apache/incubator-mxnet/issues/11567
-RUN sed -i '\#deb http://cdn-fastly.deb.debian.org/debian-security jessie/updates main#d' /etc/apt/sources.list
-RUN sed -i 's/cdn-fastly.//' /etc/apt/sources.list
+#RUN sed -i '\#deb http://cdn-fastly.deb.debian.org/debian-security jessie/updates main#d' /etc/apt/sources.list
+#RUN sed -i 's/cdn-fastly.//' /etc/apt/sources.list
COPY install/ubuntu_arm.sh /work/
RUN /work/ubuntu_arm.sh
diff --git a/ci/docker/Dockerfile.build.jetson b/ci/docker/Dockerfile.build.jetson
index 15518cd..d128ebc 100644
--- a/ci/docker/Dockerfile.build.jetson
+++ b/ci/docker/Dockerfile.build.jetson
@@ -22,15 +22,15 @@
FROM nvidia/cuda:9.0-cudnn7-devel as cudabuilder
-FROM mxnetci/dockcross-linux-arm64:05082018
+FROM mxnetcipinned/dockcross-linux-arm64:11262018
ENV ARCH aarch64
ENV HOSTCC gcc
ENV TARGET ARMV8
# gh issue #11567 https://github.com/apache/incubator-mxnet/issues/11567
-RUN sed -i '\#deb http://cdn-fastly.deb.debian.org/debian-security jessie/updates main#d' /etc/apt/sources.list
-RUN sed -i 's/cdn-fastly.//' /etc/apt/sources.list
+#RUN sed -i '\#deb http://cdn-fastly.deb.debian.org/debian-security jessie/updates main#d' /etc/apt/sources.list
+#RUN sed -i 's/cdn-fastly.//' /etc/apt/sources.list
WORKDIR /work/deps
diff --git a/ci/jenkins/Jenkinsfile_edge b/ci/jenkins/Jenkinsfile_edge
index c101ba1..275a0c9 100644
--- a/ci/jenkins/Jenkinsfile_edge
+++ b/ci/jenkins/Jenkinsfile_edge
@@ -34,7 +34,7 @@ utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu', linux_
utils.main_wrapper(
core_logic: {
utils.parallel_stage('Build', [
- custom_steps.compile_armv8_jetson_gpu(),
+// custom_steps.compile_armv8_jetson_gpu(),
custom_steps.compile_armv7_cpu(),
custom_steps.compile_armv6_cpu(),
custom_steps.compile_armv8_cpu(),