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

Commit

Permalink
[v1.7.x] Backport CI fixes (#19377) (#19389)
Browse files Browse the repository at this point in the history 
* Fix CI builds failing due to invalid GPG keys. (#19377)

* Update repo and key used for installing r. Should fix sanity builds in v1.x.

* Use correct repo (trusty) as v1.x branch uses ubuntu:16.04 for container. Also remove copy GPG key command.

* Remove all references to old expired key.

Co-authored-by: Joe Evans <[email protected]>

* Install cuda-toolkit-10-0 as required.

* Install the required packages and dependencies from path to avoid conflicting packages.

Co-authored-by: Joe Evans <[email protected]>
  • Loading branch information
@josephevans
josephevans and Joe Evans authored Oct 21, 2020
1 parent 7efb5df commit f028cf8
Show file tree
Hide file tree
Showing 16 changed files with 9 additions and 20 deletions.
10 changes: 8 additions & 2 deletions ci/docker/Dockerfile.build.jetson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,14 @@ RUN aws s3 cp s3://mxnet-ci-prod-private-slave-data/nvidia/sdkm_downloads/cuda-r
dpkg -i cuda-repo-cross-aarch64-10-0-local-10.0.326_1.0-1_all.deb && \
rm cuda-repo-cross-aarch64-10-0-local-10.0.326_1.0-1_all.deb && \
apt-get update && \
apt-get install -y -f && \
apt-get install -y cuda-cross-aarch64 cuda-cross-aarch64-10-0 && \
apt install -y -f --allow-change-held-packages \
/var/cuda-repo-10-0-local-10.0.326-cross-aarch64/cuda-cross-aarch64_10.0.326-1_all.deb \
/var/cuda-repo-10-0-local-10.0.326-cross-aarch64/cuda-cross-aarch64-10-0_10.0.326-1_all.deb \
/var/cuda-repo-10-0-local-10.0.326-410.108/cuda-toolkit-10-0_10.0.326-1_amd64.deb \
/var/cuda-repo-10-0-local-10.0.326-410.108/cuda-libraries-dev-10-0_10.0.326-1_amd64.deb \
/var/cuda-repo-10-0-local-10.0.326-410.108/cuda-tools-10-0_10.0.326-1_amd64.deb \
/var/cuda-repo-10-0-local-10.0.326-410.108/cuda-cublas-dev-10-0_10.0.326-1_amd64.deb \
/var/cuda-repo-10-0-local-10.0.326-410.108/cuda-cublas-10-0_10.0.326-1_amd64.deb && \
rm -rf /var/lib/apt/lists/*

ARG USER_ID=0
Expand Down
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.ubuntu_build_cuda
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ COPY install/ubuntu_scala.sh /work/
COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh
COPY install/ubuntu_r.sh /work/
COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh
COPY install/ubuntu_perl.sh /work/
RUN /work/ubuntu_perl.sh
Expand Down
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.ubuntu_cpu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ COPY install/ubuntu_clojure.sh /work/
RUN /work/ubuntu_clojure.sh

COPY install/ubuntu_r.sh /work/
COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh

COPY install/ubuntu_perl.sh /work/
Expand Down
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.ubuntu_cpu_julia
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ COPY install/ubuntu_clojure.sh /work/
RUN /work/ubuntu_clojure.sh

COPY install/ubuntu_r.sh /work/
COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh

COPY install/ubuntu_perl.sh /work/
Expand Down
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.ubuntu_cpu_r
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ COPY install/deb_ubuntu_ccache.sh /work/
RUN /work/deb_ubuntu_ccache.sh

COPY install/ubuntu_r.sh /work/
COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh

# Always last
Expand Down
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.ubuntu_gpu_cu100
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh

COPY install/ubuntu_r.sh /work/
COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh

COPY install/ubuntu_perl.sh /work/
Expand Down
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.ubuntu_gpu_cu101
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh

COPY install/ubuntu_r.sh /work/
COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh

COPY install/ubuntu_perl.sh /work/
Expand Down
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.ubuntu_gpu_cu102
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh

COPY install/ubuntu_r.sh /work/
COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh

COPY install/ubuntu_perl.sh /work/
Expand Down
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.ubuntu_gpu_cu80
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh

COPY install/ubuntu_r.sh /work/
COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh

COPY install/ubuntu_perl.sh /work/
Expand Down
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.ubuntu_gpu_cu90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh

COPY install/ubuntu_r.sh /work/
COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh

COPY install/ubuntu_perl.sh /work/
Expand Down
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.ubuntu_gpu_cu92
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh

COPY install/ubuntu_r.sh /work/
COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh

COPY install/ubuntu_perl.sh /work/
Expand Down
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.ubuntu_nightly_cpu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh

COPY install/ubuntu_r.sh /work/
COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh

COPY install/ubuntu_perl.sh /work/
Expand Down
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.ubuntu_nightly_gpu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ COPY install/sbt.gpg /work/
RUN /work/ubuntu_scala.sh

COPY install/ubuntu_r.sh /work/
COPY install/r.gpg /work/
RUN /work/ubuntu_r.sh

COPY install/ubuntu_perl.sh /work/
Expand Down
2 changes: 0 additions & 2 deletions ci/docker/install/export_gpg_keys.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,3 @@

gpg --keyserver keyserver.ubuntu.com --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
gpg --output sbt.gpg --export [email protected]
gpg --keyserver keyserver.ubuntu.com --recv E084DAB9
gpg --output r.gpg --export [email protected]
Binary file removed ci/docker/install/r.gpg
View file
Binary file not shown.
5 changes: 1 addition & 4 deletions ci/docker/install/ubuntu_r.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ cd "$(dirname "$0")"
# install libraries for mxnet's r package on ubuntu
echo "deb http://cran.rstudio.com/bin/linux/ubuntu trusty/" >> /etc/apt/sources.list

apt-key add r.gpg

# Installing the latest version (3.3+) that is compatible with MXNet
add-apt-repository 'deb [arch=amd64,i386] https://cran.rstudio.com/bin/linux/ubuntu xenial/'
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9

apt-get update || true
apt-get install -y --allow-unauthenticated \
Expand Down

0 comments on commit f028cf8

Please sign in to comment.