KellenSunderland closed pull request #13402: Replace mxnetci dockcross with
public dockcross due to missing image
URL: https://github.com/apache/incubator-mxnet/pull/13402
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/Jenkinsfile b/Jenkinsfile
index 79392b49d5a..015ca81bad7 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 799e29c9912..c601fc5e5ff 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 "pllar...@amazon.com"
# The cross-compiling emulator
diff --git a/ci/docker/Dockerfile.build.android_armv8
b/ci/docker/Dockerfile.build.android_armv8
index 2c2c71c003f..60376b8efda 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 "pllar...@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 78071fa3399..6f16d8c77a0 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 9a23a5dbefe..5f0223448f1 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 46cc229d590..27bd425ae9b 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 15518cd6f22..d128ebc7e2a 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 c101ba10238..275a0c96de9 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(),
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
