Fix CI builds failing due to invalid GPG keys. (apache#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]>
josephevans · Oct 20, 2020 · 726ab20 · 726ab20
1 parent 4e4dfd2
commit 726ab20
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 18 deletions.
diff --git a/ci/docker/Dockerfile.build.ubuntu_build_cuda b/ci/docker/Dockerfile.build.ubuntu_build_cuda
@@ -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

diff --git a/ci/docker/Dockerfile.build.ubuntu_cpu b/ci/docker/Dockerfile.build.ubuntu_cpu
@@ -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/

diff --git a/ci/docker/Dockerfile.build.ubuntu_cpu_julia b/ci/docker/Dockerfile.build.ubuntu_cpu_julia
@@ -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/

diff --git a/ci/docker/Dockerfile.build.ubuntu_cpu_r b/ci/docker/Dockerfile.build.ubuntu_cpu_r
@@ -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

diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu100
@@ -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/

diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu101
@@ -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/

diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102
@@ -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/

diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu80 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu80
@@ -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/

diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu90
@@ -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/

diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu92
@@ -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/

diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_cpu b/ci/docker/Dockerfile.build.ubuntu_nightly_cpu
@@ -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/

diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu
@@ -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/

diff --git a/ci/docker/install/export_gpg_keys.sh b/ci/docker/install/export_gpg_keys.sh
@@ -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]
diff --git a/ci/docker/install/r.gpg b/ci/docker/install/r.gpg
diff --git a/ci/docker/install/ubuntu_r.sh b/ci/docker/install/ubuntu_r.sh
@@ -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 \