Remove openSUSE 15.4 for EOL

rstudio · May 2, 2024 · 770f273 · 770f273
1 parent 896e32a
commit 770f273
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 247 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-PLATFORMS := ubuntu-2004 ubuntu-2204 ubuntu-2404 debian-10 debian-11 debian-12 centos-7 centos-8 rhel-9 opensuse-154 opensuse-155 fedora-38 fedora-39
+PLATFORMS := ubuntu-2004 ubuntu-2204 ubuntu-2404 debian-10 debian-11 debian-12 centos-7 centos-8 rhel-9 opensuse-155 fedora-38 fedora-39
 SLS_BINARY ?= ./node_modules/serverless/bin/serverless.js
 
 deps:

diff --git a/README.md b/README.md
@@ -23,9 +23,7 @@ R binaries are built for the following Linux operating systems:
 - Debian 10, 11, 12
 - CentOS 7
 - Red Hat Enterprise Linux 7, 8, 9
-- openSUSE 15.4
 - openSUSE 15.5
-- SUSE Linux Enterprise 15 SP4
 - SUSE Linux Enterprise 15 SP5
 - Fedora 38, 39
 
@@ -143,10 +141,6 @@ sudo yum install R-${R_VERSION}-1-1.x86_64.rpm
 
 Download the rpm package:
 ```bash
-# openSUSE 15.4 / SLES 15 SP4
-curl -O https://cdn.posit.co/r/opensuse-154/pkgs/R-${R_VERSION}-1-1.x86_64.rpm
-
-
 # openSUSE 15.5 / SLES 15 SP5
 curl -O https://cdn.posit.co/r/opensuse-155/pkgs/R-${R_VERSION}-1-1.x86_64.rpm
 ```

diff --git a/builder/Dockerfile.opensuse-154 b/builder/Dockerfile.opensuse-154
diff --git a/builder/docker-compose.yml b/builder/docker-compose.yml
@@ -119,18 +119,6 @@ services:
     image: r-builds:opensuse-155
     volumes:
       - ./integration/tmp:/tmp/output
-  opensuse-154:
-    command: ./build.sh
-    environment:
-      - R_VERSION=${R_VERSION}
-      - R_INSTALL_PATH=${R_INSTALL_PATH}
-      - LOCAL_STORE=/tmp/output
-    build:
-      context: .
-      dockerfile: Dockerfile.opensuse-154
-    image: r-builds:opensuse-154
-    volumes:
-      - ./integration/tmp:/tmp/output
   fedora-38:
     command: ./build.sh
     environment:

diff --git a/builder/package.opensuse-154 b/builder/package.opensuse-154
diff --git a/serverless-resources.yml b/serverless-resources.yml
@@ -269,20 +269,6 @@ rBuildsBatchJobDefinitionOpensuse155:
       Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:opensuse-155"
     Timeout:
       AttemptDurationSeconds: 7200
-rBuildsBatchJobDefinitionOpensuse154:
-  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-154"
-    Timeout:
-      AttemptDurationSeconds: 7200
 rBuildsBatchJobDefinitionFedora38:
   Type: AWS::Batch::JobDefinition
   Properties:

diff --git a/serverless.yml b/serverless.yml
@@ -75,13 +75,11 @@ provider:
       Ref: rBuildsBatchJobDefinitionRhel9
     JOB_DEFINITION_ARN_opensuse_155:
       Ref: rBuildsBatchJobDefinitionOpensuse155
-    JOB_DEFINITION_ARN_opensuse_154:
-      Ref: rBuildsBatchJobDefinitionOpensuse154
     JOB_DEFINITION_ARN_fedora_38:
       Ref: rBuildsBatchJobDefinitionFedora38
     JOB_DEFINITION_ARN_fedora_39:
       Ref: rBuildsBatchJobDefinitionFedora39
-    SUPPORTED_PLATFORMS: ubuntu-2004,ubuntu-2204,ubuntu-2404,debian-10,debian-11,debian-12,centos-7,centos-8,rhel-9,opensuse-154,opensuse-155,fedora-38,fedora-39
+    SUPPORTED_PLATFORMS: ubuntu-2004,ubuntu-2204,ubuntu-2404,debian-10,debian-11,debian-12,centos-7,centos-8,rhel-9,opensuse-155,fedora-38,fedora-39
 
 functions:
   queueBuilds:

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -79,14 +79,6 @@ services:
       - R_VERSION=${R_VERSION}
     volumes:
       - ../:/r-builds
-  opensuse-154:
-    image: opensuse/leap:15.4
-    command: /r-builds/test/test-zypper.sh
-    environment:
-      - OS_IDENTIFIER=opensuse-154
-      - R_VERSION=${R_VERSION}
-    volumes:
-      - ../:/r-builds
   fedora-38:
     image: fedora:38
     command: /r-builds/test/test-yum.sh