Try to work around flaky keyserver.ubuntu.com responses

rstudio · Oct 6, 2023 · 801b09d · 801b09d
1 parent e8bbd92
commit 801b09d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -120,7 +120,9 @@ try {
     node('docker') {
       stage('Prepare Versioning Container') {
         prepareWorkspace()
-        container = pullBuildPush(image_name: 'jenkins/rlp-sdk', dockerfile: "docker/jenkins/Dockerfile.versioning", image_tag: "rlp-sdk-versioning", build_args: jenkins_user_build_args())
+        retry(1) {
+          container = pullBuildPush(image_name: 'jenkins/rlp-sdk', dockerfile: "docker/jenkins/Dockerfile.versioning", image_tag: "rlp-sdk-versioning", build_args: jenkins_user_build_args())
+        }
         container.inside() {
           stage('Bump Version') {
             def rlpSdkVersion = sh (
@@ -183,7 +185,9 @@ try {
       node ('docker') {
         stage('Prepare Packaging Container') {
           prepareWorkspace()
-          container = pullBuildPush(image_name: 'jenkins/rlp-sdk', dockerfile: "docker/jenkins/Dockerfile.packaging", image_tag: "rlp-sdk-packaging", build_args: jenkins_user_build_args())
+          retry(1) {
+            container = pullBuildPush(image_name: 'jenkins/rlp-sdk', dockerfile: "docker/jenkins/Dockerfile.packaging", image_tag: "rlp-sdk-packaging", build_args: jenkins_user_build_args())
+          }
           container.inside() {
             stage('Generate Documentation') {
               retry(1) {

diff --git a/dependencies/install-bookdown.sh b/dependencies/install-bookdown.sh
@@ -49,7 +49,7 @@ if [[ $INSTALL_R -eq 1 ]]; then
     sudo yum install -y R
   else
     sudo apt-get -y  install apt-transport-https software-properties-common
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9
+    sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9
     sudo add-apt-repository -y 'deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran35/'
     sudo apt update
     sudo apt-get -y install r-base wget