From 58e5fc9a3f7117309fd34b8a673b884bacb7924f Mon Sep 17 00:00:00 2001 From: Joe Evans Date: Tue, 20 Oct 2020 15:59:16 -0700 Subject: [PATCH] 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 Co-authored-by: Joe Evans --- 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(-) delete mode 100644 ci/docker/install/r.gpg diff --git a/ci/docker/Dockerfile.build.ubuntu_build_cuda b/ci/docker/Dockerfile.build.ubuntu_build_cuda index 07f67d178c2c..4840d3703d12 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 b1eb89bb3f36..6893499d70a8 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 b1eb89bb3f36..6893499d70a8 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 264d34cd6422..f41b651585cf 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 9a18e94bd40c..b792bae44a04 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 a17261bfa820..a3e0ece760f0 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 7a21e74a3b8b..52d65aaba0f4 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 83f05fddf261..c203161a0cbf 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 f43dc590e2cc..0e180a31eef4 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 3b1ea6c781ad..fe72b2e03d4e 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 5717df1b9130..b9c275e00919 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 5e812c433b43..216e96fcebb8 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 604a27b98143..a4882aff5424 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 scalasbt@gmail.com -gpg --keyserver keyserver.ubuntu.com --recv E084DAB9 -gpg --output r.gpg --export marutter@gmail.com diff --git a/ci/docker/install/r.gpg b/ci/docker/install/r.gpg deleted file mode 100644 index 77fd6341e9d44dc73c40172d3428ac99413db3df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1519 zcmZ|OZ9EeQ0LSq?m~EbIp4!es7D+J_5iymNMxH4e!;)+z&q|rhX+w$+VUk5n-7cm) ztVj#Tj%=!V8b^|nBj;hKFju{}>&?CUzy5vx-x8p*9KNN#0|*1Kk3l~sHtw8zttc}n z541squ4z{-YFKdXC0=71mqzE^=E@fGFbegp)L(4EG3Tn;Ea}{u_FTk){Oy6xfNYNf znV$##xpD9$Cvk5EQ%3N_JM02U=K#phb#3QUB(ur{0be-PI7L2eBDf^oh-+9a2eXXL zTeznhH*V=^^AnWZ%#N_TnhDobgv;aN)ol*##3l>*P`lo&?5utZFp5!pYSFA4Ux*<8 z^@&jvpHXuOw){bL-7Ir*=E;ef1H*eqTev;}}*TNju6H zy&dP=%zwkscT}+it8@|utBlw%%1{m54It|C!k4kYsG5{>ch{ zMq$35(%81XHfPKF)1t+s zbz=aHk$x5AEw}6$cBY*o-5r_7?{rE(t*#5?SvYZ-_w~wkLhZzkX$M9)-1S?m6?uT| zUK_7PX=(1n2b_%xe+w%Q`d9q_ufENSHYNW zAn<{q)?o14%sju6wGY09neS_}nnP^p1LoO+V<2-a`bq}{EjPgN>!Tq=MQX*6#fB-Y zaFa`Zi_W2iw3*LHv;uT&s#p}s2D}!h}b^Qdz!;R&b z`bfX8OoX`7lOTnqgs4rm0ZQBjOHdNqV1{&8z0{PLp{h#SiTe4cjmnC+x$?ql73J8| zQc21CN7)!J{L+;N1>DNpOZPh@@i8mZ*G5xY68z^;cWbEE>%X(51C8W#zKT=@p_RVD z8&LiZukFX*n1w=R);P)09K?k1@x3zcU+>OeCOxGSNzHV!XJDmkVL=5!sJc3KBULks z?S3uB^X1K80}j~g5Tu#Q(YJ&dg~A}J+HYoESUe-N#{RlrgUC#B!BTih{^5xW$DRsO zhkOwyKGe$cc?57)cgP-{Hr&auFPAK^_v@AdqYTHAd%Q){p4fxAia0JqeWE|(PVc;F zxgEY{{bHvw6p*K diff --git a/ci/docker/install/ubuntu_r.sh b/ci/docker/install/ubuntu_r.sh index b7ddea78f90a..cd5fcb821d6f 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 \