Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Replace mxnetci dockcross with public dockcross due to missing image #13402

Merged
merged 4 commits into from
Nov 26, 2018
Merged

Replace mxnetci dockcross with public dockcross due to missing image #13402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc49652
Replace mxnetci dockcross with public dockcross due to missing image
marcoabreu Nov 25, 2018
5d1d665
Remove source lists change
Nov 25, 2018
2177ed7
Disable Jetson
Nov 25, 2018
05c2cc4
Move to mxnetcipinned
marcoabreu Nov 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile.build.android_armv7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "[email protected]"

# The cross-compiling emulator
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile.build.android_armv8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "[email protected]"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile.build.armv6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile.build.armv7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ci/docker/Dockerfile.build.armv8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ci/docker/Dockerfile.build.jetson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/jenkins/Jenkinsfile_edge
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down