[arrow] branch master updated: MINOR: [R] Drop opensuse42 build and update opensuse15 (#13312)

[np...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

npr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new b821c16e97 MINOR: [R] Drop opensuse42 build and update opensuse15 (#13312)
b821c16e97 is described below

commit b821c16e976728e617599c8127c85c273cd069a1
Author: Neal Richardson <ne...@gmail.com>
AuthorDate: Sun Jun 5 16:52:51 2022 -0400

    MINOR: [R] Drop opensuse42 build and update opensuse15 (#13312)
    
    The opensuse42 job has been failing for a while on nightlies, and it is EOL and RSPM is no longer doing anything for it, so we should drop it.
    
    Authored-by: Neal Richardson <ne...@gmail.com>
    Signed-off-by: Neal Richardson <ne...@gmail.com>
---
 ci/etc/rprofile     | 8 +++++---
 dev/tasks/tasks.yml | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ci/etc/rprofile b/ci/etc/rprofile
index e9e98b12e4..2f64b17e5d 100644
--- a/ci/etc/rprofile
+++ b/ci/etc/rprofile
@@ -2,7 +2,9 @@ local({
   .pick_cran <- function() {
     # Return a CRAN repo URL, preferring RSPM binaries if available for this OS
     rspm_template <- "https://packagemanager.rstudio.com/cran/__linux__/%s/latest"
-    supported_os <- c("focal", "xenial", "bionic", "centos7", "centos8", "opensuse42", "opensuse15", "opensuse152")
+    # See https://github.com/rstudio/r-docker#releases-and-tags,
+    # but note that RSPM still uses "centos8"
+    supported_os <- c("bionic", "focal", "jammy", "centos7", "centos8", "opensuse153")
 
     if (nzchar(Sys.which("lsb_release"))) {
       os <- tolower(system("lsb_release -cs", intern = TRUE))
@@ -19,8 +21,8 @@ local({
         return(sprintf(rspm_template, os))
       } else {
         names(vals) <- sub("^(.*)=.*$", "\\1", os_release)
-        if (vals["ID"] == "opensuse") {
-          version <- sub('^"?([0-9]+).*"?.*$', "\\1", vals["VERSION_ID"])
+        if (grepl("opensuse", vals["ID"])) {
+          version <- sub('^"?([0-9]+)\\.?([0-9]+).*"?.*$', "\\1\\2", vals["VERSION_ID"])
           os <- paste0("opensuse", version)
           if (os %in% supported_os) {
             return(sprintf(rspm_template, os))
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 11675e8bba..7a8fd83161 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -1331,8 +1331,7 @@ tasks:
 {% for r_org, r_image, r_tag in [("rhub", "ubuntu-gcc-release", "latest"),
                                  ("rocker", "r-base", "latest"),
                                  ("rstudio", "r-base", "4.2-focal"),
-                                 ("rstudio", "r-base", "4.1-opensuse15"),
-                                 ("rstudio", "r-base", "4.2-opensuse42")] %}
+                                 ("rstudio", "r-base", "4.1-opensuse153")] %}
   test-r-{{ r_org }}-{{ r_image }}-{{ r_tag }}:
     ci: azure
     template: r/azure.linux.yml