This is an automated email from the ASF dual-hosted git repository.
samskalicky pushed a commit to branch v1.8.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.8.x by this push:
new 58e5fc9 Fix CI builds failing due to invalid GPG keys. (#19377)
(#19388)
58e5fc9 is described below
commit 58e5fc9a3f7117309fd34b8a673b884bacb7924f
Author: Joe Evans <[email protected]>
AuthorDate: Tue Oct 20 15:59:16 2020 -0700
Fix CI builds failing due to invalid GPG keys. (#19377) (#19388)
* 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]>
Co-authored-by: Joe Evans <[email protected]>
---
ci/docker/Dockerfile.build.ubuntu_build_cuda | 1 -
ci/docker/Dockerfile.build.ubuntu_cpu | 1 -
ci/docker/Dockerfile.build.ubuntu_cpu_julia | 1 -
ci/docker/Dockerfile.build.ubuntu_cpu_r | 1 -
ci/docker/Dockerfile.build.ubuntu_gpu_cu100 | 1 -
ci/docker/Dockerfile.build.ubuntu_gpu_cu101 | 1 -
ci/docker/Dockerfile.build.ubuntu_gpu_cu102 | 1 -
ci/docker/Dockerfile.build.ubuntu_gpu_cu80 | 1 -
ci/docker/Dockerfile.build.ubuntu_gpu_cu90 | 1 -
ci/docker/Dockerfile.build.ubuntu_gpu_cu92 | 1 -
ci/docker/Dockerfile.build.ubuntu_nightly_cpu | 1 -
ci/docker/Dockerfile.build.ubuntu_nightly_gpu | 1 -
ci/docker/install/export_gpg_keys.sh | 2 --
ci/docker/install/r.gpg | Bin 1519 -> 0 bytes
ci/docker/install/ubuntu_r.sh | 5 +----
15 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/ci/docker/Dockerfile.build.ubuntu_build_cuda
b/ci/docker/Dockerfile.build.ubuntu_build_cuda
index 07f67d1..4840d37 100644
--- 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
index b1eb89b..6893499 100644
--- 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
index b1eb89b..6893499 100644
--- 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
index 264d34c..f41b651 100644
--- 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
index 9a18e94..b792bae 100644
--- 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
index a17261b..a3e0ece 100644
--- 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
index 7a21e74..52d65aa 100644
--- 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
index 83f05fd..c203161 100644
--- 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
index f43dc59..0e180a3 100644
--- 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
index 3b1ea6c..fe72b2e 100644
--- 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
index 5717df1..b9c275e 100644
--- 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
index 5e812c4..216e96f 100644
--- 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
index 604a27b..a4882af 100755
--- 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
deleted file mode 100644
index 77fd634..0000000
Binary files a/ci/docker/install/r.gpg and /dev/null differ
diff --git a/ci/docker/install/ubuntu_r.sh b/ci/docker/install/ubuntu_r.sh
index b7ddea7..cd5fcb8 100755
--- 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 \
