add support for sles15sp5

Makefile

@@ -1,4 +1,4 @@
-PLATFORMS := ubuntu-2004 ubuntu-2204 debian-10 debian-11 debian-12 centos-7 centos-8 rhel-9 opensuse-154 fedora-37 fedora-38
+PLATFORMS := ubuntu-2004 ubuntu-2204 debian-10 debian-11 debian-12 centos-7 centos-8 rhel-9 opensuse-154 opensuse-155 fedora-37 fedora-38
 SLS_BINARY ?= ./node_modules/serverless/bin/serverless.js
 
 deps:

builder/Dockerfile.opensuse-155

@@ -0,0 +1,103 @@
+FROM opensuse/leap:15.5
+
+ENV OS_IDENTIFIER opensuse-155
+
+# Most of these packages, and also the configure options that follow were determined
+# by reviewing "R-base.spec" from the following OpenSUSE RPM:
+# https://download.opensuse.org/repositories/devel:/languages:/R:/released/openSUSE_Leap_42.3/src/R-base-3.5.3-103.1.src.rpm
+
+RUN zypper --non-interactive update
+RUN zypper --non-interactive --gpg-auto-import-keys -n install \
+    bzip2 \
+    cairo-devel \
+    curl \
+    fdupes \
+    gcc \
+    gcc-c++ \
+    gcc-fortran \
+    glib2-devel \
+    glibc-locale \
+    help2man \
+    # Like openSUSE/SLES 15.4, SUSE 15.5 ships with both ICU 65 (libicu-devel) and
+    # ICU 69 (icu.691-devel). Prefer ICU 69 because the devel packages can't coexist, and
+    # zypper resolves libicu-devel to icu.691-devel when installing RPMs.
+    icu.691-devel \
+    java-11-openjdk-devel \
+    libX11-devel \
+    libXScrnSaver-devel \
+    libXmu-devel \
+    libXt-devel \
+    libbz2-devel \
+    libcurl-devel \
+    libjpeg-devel \
+    libpng-devel \
+    libtiff-devel \
+    make \
+    pango-devel \
+    pcre-devel \
+    pcre2-devel \
+    perl \
+    perl-macros \
+    readline-devel \
+    rpm-build \
+    shadow \
+    tcl-devel \
+    texinfo \
+    texlive-ae \
+    texlive-bibtex \
+    texlive-cm-super \
+    texlive-dvips \
+    texlive-fancyvrb \
+    texlive-helvetic \
+    texlive-inconsolata \
+    texlive-latex \
+    texlive-makeindex \
+    texlive-metafont \
+    texlive-psnfss \
+    texlive-tex \
+    texlive-times \
+    tk-devel \
+    unzip \
+    wget \
+    xdg-utils \
+    xorg-x11-devel \
+    xz-devel \
+    zip \
+    zlib-devel \
+    && zypper clean
+
+# Install AWS CLI
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" && \
+    unzip awscliv2.zip && \
+    ./aws/install && \
+    rm -rf aws awscliv2.zip
+
+RUN if [ "$(arch)" == "aarch64" ]; then echo arm64; else echo amd64; fi > /tmp/arch
+
+RUN curl -LO "https://github.com/goreleaser/nfpm/releases/download/v2.18.1/nfpm_$(cat /tmp/arch).rpm" && \
+    zypper --non-interactive --no-gpg-checks install "nfpm_$(cat /tmp/arch).rpm" && \
+    rm "nfpm_$(cat /tmp/arch).rpm"
+
+RUN chmod 0777 /opt
+
+# Configure flags for SUSE that don't use the defaults in build.sh
+ENV CONFIGURE_OPTIONS="\
+    --enable-R-shlib \
+    --with-tcltk \
+    --with-x \
+    --enable-memory-profiling \
+    --with-tcl-config=/usr/lib64/tclConfig.sh \
+    --with-tk-config=/usr/lib64/tkConfig.sh"
+
+# Make sure that patching Java does not break R.
+# On SUSE, the default JAVA_HOME path always uses the major Java version only,
+# but the JDK path is chosen by default. We change this to the JRE path to
+# support users who only want to install the JRE (non-devel) package.
+# https://cran.r-project.org/doc/manuals/r-release/R-admin.html#Java-support
+# https://solutions.posit.co/envs-pkgs/using-rjava/
+ENV JAVA_HOME=/usr/lib64/jvm/jre-11-openjdk
+
+COPY package.opensuse-155 /package.sh
+COPY build.sh .
+COPY patches /patches
+ENTRYPOINT ./build.sh

builder/docker-compose.yml

@@ -95,6 +95,18 @@ services:
     image: r-builds:rhel-9
     volumes:
       - ./integration/tmp:/tmp/output
+  opensuse-155:
+    command: ./build.sh
+    environment:
+      - R_VERSION=${R_VERSION}
+      - R_INSTALL_PATH=${R_INSTALL_PATH}
+      - LOCAL_STORE=/tmp/output
+    build:
+      context: .
+      dockerfile: Dockerfile.opensuse-155
+    image: r-builds:opensuse-155
+    volumes:
+      - ./integration/tmp:/tmp/output
   opensuse-154:
     command: ./build.sh
     environment:

serverless-resources.yml

@@ -243,6 +243,20 @@ rBuildsBatchJobDefinitionRhel9:
       Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:rhel-9"
     Timeout:
       AttemptDurationSeconds: 7200
+rBuildsBatchJobDefinitionOpensuse155:
+  Type: AWS::Batch::JobDefinition
+  Properties:
+    Type: container
+    ContainerProperties:
+      Command:
+        - ./build.sh
+      Vcpus: 4
+      Memory: 4096
+      JobRoleArn:
+        "Fn::GetAtt": [ rBuildsEcsTaskIamRole, Arn ]
+      Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:opensuse-155"
+    Timeout:
+      AttemptDurationSeconds: 7200
 rBuildsBatchJobDefinitionOpensuse154:
   Type: AWS::Batch::JobDefinition
   Properties:

serverless.yml

@@ -61,13 +61,15 @@ provider:
       Ref: rBuildsBatchJobDefinitionCentos8
     JOB_DEFINITION_ARN_rhel_9:
       Ref: rBuildsBatchJobDefinitionRhel9
+    JOB_DEFINITION_ARN_opensuse_155:
+      Ref: rBuildsBatchJobDefinitionOpensuse155
     JOB_DEFINITION_ARN_opensuse_154:
       Ref: rBuildsBatchJobDefinitionOpensuse154
     JOB_DEFINITION_ARN_fedora_37:
       Ref: rBuildsBatchJobDefinitionFedora37
     JOB_DEFINITION_ARN_fedora_38:
       Ref: rBuildsBatchJobDefinitionFedora38
-    SUPPORTED_PLATFORMS: ubuntu-2004,ubuntu-2204,debian-10,debian-11,debian-12,centos-7,centos-8,rhel-9,opensuse-154,fedora-37,fedora-38
+    SUPPORTED_PLATFORMS: ubuntu-2004,ubuntu-2204,debian-10,debian-11,debian-12,centos-7,centos-8,rhel-9,opensuse-154,opensuse-155,fedora-37,fedora-38
 
 functions:
   queueBuilds:

test/docker-compose.yml

@@ -63,6 +63,14 @@ services:
       - R_VERSION=${R_VERSION}
     volumes:
       - ../:/r-builds
+  opensuse-155:
+    image: opensuse/leap:15.5
+    command: /r-builds/test/test-zypper.sh
+    environment:
+      - OS_IDENTIFIER=opensuse-155
+      - R_VERSION=${R_VERSION}
+    volumes:
+      - ../:/r-builds
   opensuse-154:
     image: opensuse/leap:15.4
     command: /r-builds/test/test-zypper.sh