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

Commit

Permalink
Fix CI builds failing due to invalid GPG keys. (#19377) (#19388)
Browse files Browse the repository at this point in the history 
* 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 <joeev@amazon.com>

Co-authored-by: Joe Evans <joeev@amazon.com>
  • Loading branch information
@josephevans
josephevans and Joe Evans authored Oct 20, 2020
1 parent 4e4dfd2 commit 58e5fc9
Show file tree
Hide file tree
Showing 15 changed files with 1 addition and 18 deletions.
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 scalasbt@gmail.com
gpg --keyserver keyserver.ubuntu.com --recv E084DAB9
gpg --output r.gpg --export marutter@gmail.com
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 58e5fc9

Please sign in to comment.