Remove openSUSE 15.4 for EOL
This commit is contained in:
parent
896e32a8b3
commit
770f273ce1
8 changed files with 2 additions and 247 deletions
2
Makefile
2
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
|
SLS_BINARY ?= ./node_modules/serverless/bin/serverless.js
|
||||||
|
|
||||||
deps:
|
deps:
|
||||||
|
|
|
||||||
|
|
@ -23,9 +23,7 @@ R binaries are built for the following Linux operating systems:
|
||||||
- Debian 10, 11, 12
|
- Debian 10, 11, 12
|
||||||
- CentOS 7
|
- CentOS 7
|
||||||
- Red Hat Enterprise Linux 7, 8, 9
|
- Red Hat Enterprise Linux 7, 8, 9
|
||||||
- openSUSE 15.4
|
|
||||||
- openSUSE 15.5
|
- openSUSE 15.5
|
||||||
- SUSE Linux Enterprise 15 SP4
|
|
||||||
- SUSE Linux Enterprise 15 SP5
|
- SUSE Linux Enterprise 15 SP5
|
||||||
- Fedora 38, 39
|
- Fedora 38, 39
|
||||||
|
|
||||||
|
|
@ -143,10 +141,6 @@ sudo yum install R-${R_VERSION}-1-1.x86_64.rpm
|
||||||
|
|
||||||
Download the rpm package:
|
Download the rpm package:
|
||||||
```bash
|
```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
|
# openSUSE 15.5 / SLES 15 SP5
|
||||||
curl -O https://cdn.posit.co/r/opensuse-155/pkgs/R-${R_VERSION}-1-1.x86_64.rpm
|
curl -O https://cdn.posit.co/r/opensuse-155/pkgs/R-${R_VERSION}-1-1.x86_64.rpm
|
||||||
```
|
```
|
||||||
|
|
|
||||||
|
|
@ -1,103 +0,0 @@
|
||||||
FROM opensuse/leap:15.4
|
|
||||||
|
|
||||||
ENV OS_IDENTIFIER opensuse-154
|
|
||||||
|
|
||||||
# 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.3, SUSE 15.4 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-154 /package.sh
|
|
||||||
COPY build.sh .
|
|
||||||
COPY patches /patches
|
|
||||||
ENTRYPOINT ./build.sh
|
|
||||||
|
|
@ -119,18 +119,6 @@ services:
|
||||||
image: r-builds:opensuse-155
|
image: r-builds:opensuse-155
|
||||||
volumes:
|
volumes:
|
||||||
- ./integration/tmp:/tmp/output
|
- ./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:
|
fedora-38:
|
||||||
command: ./build.sh
|
command: ./build.sh
|
||||||
environment:
|
environment:
|
||||||
|
|
|
||||||
|
|
@ -1,100 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
if [[ ! -d /tmp/output/${OS_IDENTIFIER} ]]; then
|
|
||||||
mkdir -p "/tmp/output/${OS_IDENTIFIER}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# R 3.x requires PCRE1
|
|
||||||
pcre_lib='pcre2-devel'
|
|
||||||
if [[ "${R_VERSION}" =~ ^3 ]]; then
|
|
||||||
pcre_lib='pcre-devel'
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Create post-install script required for OpenBLAS.
|
|
||||||
#
|
|
||||||
# On RHEL and SUSE, we link R against the internal shared BLAS to make the
|
|
||||||
# R binaries more portable and allow users to switch BLAS implementations without
|
|
||||||
# having to recompile R. We default to OpenBLAS, but users may prefer other implementations.
|
|
||||||
#
|
|
||||||
# Binary packages built against the shared BLAS are also more portable and may be used
|
|
||||||
# with the default R distributed by RHEL/SUSE, or other R installations using
|
|
||||||
# shared BLAS and configured with a different BLAS (such as Microsoft R Open with MKL).
|
|
||||||
# This is especially important for RSPM's binary packages.
|
|
||||||
#
|
|
||||||
# On Ubuntu/Debian, we link R against the external BLAS instead (--with-blas/--with-lapack),
|
|
||||||
# as those distributions use the alternatives system to swap BLAS libraries at runtime.
|
|
||||||
# The default R distributions on Ubuntu/Debian use the external BLAS, so we do as well
|
|
||||||
# for portability.
|
|
||||||
#
|
|
||||||
# https://cran.r-project.org/doc/manuals/r-release/R-admin.html#Shared-BLAS
|
|
||||||
cat <<EOF >> /post-install.sh
|
|
||||||
mv ${R_INSTALL_PATH}/lib/R/lib/libRblas.so ${R_INSTALL_PATH}/lib/R/lib/libRblas.so.keep
|
|
||||||
ln -s /usr/lib64/libopenblas.so ${R_INSTALL_PATH}/lib/R/lib/libRblas.so
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Create after-remove script to remove internal BLAS, which won't be cleaned up automatically.
|
|
||||||
cat <<EOF >> /after-remove.sh
|
|
||||||
if [ -d ${R_INSTALL_PATH} ]; then
|
|
||||||
rm -r ${R_INSTALL_PATH}
|
|
||||||
fi
|
|
||||||
EOF
|
|
||||||
|
|
||||||
if [ "$(arch)" == "aarch64" ]; then echo arm64; else echo amd64; fi > /tmp/arch
|
|
||||||
|
|
||||||
cat <<EOF > /tmp/nfpm.yml
|
|
||||||
name: R-${R_VERSION}
|
|
||||||
version: 1
|
|
||||||
version_schema: none
|
|
||||||
arch: $(cat /tmp/arch)
|
|
||||||
release: 1
|
|
||||||
maintainer: Posit Software, PBC <https://github.com/rstudio/r-builds>
|
|
||||||
description: |
|
|
||||||
GNU R statistical computation and graphics system
|
|
||||||
vendor: Posit Software, PBC
|
|
||||||
homepage: https://www.r-project.org
|
|
||||||
license: GPLv2+
|
|
||||||
depends:
|
|
||||||
- fontconfig
|
|
||||||
- gcc
|
|
||||||
- gcc-c++
|
|
||||||
- gcc-fortran
|
|
||||||
- glibc-locale
|
|
||||||
- gzip
|
|
||||||
- icu.691-devel
|
|
||||||
- libbz2-devel
|
|
||||||
- libcairo2
|
|
||||||
- libcurl-devel
|
|
||||||
- libfreetype6
|
|
||||||
- libgomp1
|
|
||||||
- libjpeg62
|
|
||||||
- libopenblas_pthreads-devel
|
|
||||||
- libpango-1_0-0
|
|
||||||
- libreadline7
|
|
||||||
- libtiff5
|
|
||||||
- make
|
|
||||||
- ${pcre_lib}
|
|
||||||
- tar
|
|
||||||
- tcl
|
|
||||||
- tk
|
|
||||||
- unzip
|
|
||||||
- which
|
|
||||||
- xorg-x11
|
|
||||||
- xorg-x11-fonts-100dpi
|
|
||||||
- xorg-x11-fonts-75dpi
|
|
||||||
- xz-devel
|
|
||||||
- zip
|
|
||||||
- zlib-devel
|
|
||||||
contents:
|
|
||||||
- src: ${R_INSTALL_PATH}
|
|
||||||
dst: ${R_INSTALL_PATH}
|
|
||||||
scripts:
|
|
||||||
postinstall: /post-install.sh
|
|
||||||
postremove: /after-remove.sh
|
|
||||||
EOF
|
|
||||||
|
|
||||||
nfpm package \
|
|
||||||
-f /tmp/nfpm.yml \
|
|
||||||
-p rpm \
|
|
||||||
-t "/tmp/output/${OS_IDENTIFIER}"
|
|
||||||
|
|
||||||
export PKG_FILE=$(ls /tmp/output/${OS_IDENTIFIER}/R-${R_VERSION}*.rpm | head -1)
|
|
||||||
|
|
@ -269,20 +269,6 @@ rBuildsBatchJobDefinitionOpensuse155:
|
||||||
Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:opensuse-155"
|
Image: "#{AWS::AccountId}.dkr.ecr.#{AWS::Region}.amazonaws.com/r-builds:opensuse-155"
|
||||||
Timeout:
|
Timeout:
|
||||||
AttemptDurationSeconds: 7200
|
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:
|
rBuildsBatchJobDefinitionFedora38:
|
||||||
Type: AWS::Batch::JobDefinition
|
Type: AWS::Batch::JobDefinition
|
||||||
Properties:
|
Properties:
|
||||||
|
|
|
||||||
|
|
@ -75,13 +75,11 @@ provider:
|
||||||
Ref: rBuildsBatchJobDefinitionRhel9
|
Ref: rBuildsBatchJobDefinitionRhel9
|
||||||
JOB_DEFINITION_ARN_opensuse_155:
|
JOB_DEFINITION_ARN_opensuse_155:
|
||||||
Ref: rBuildsBatchJobDefinitionOpensuse155
|
Ref: rBuildsBatchJobDefinitionOpensuse155
|
||||||
JOB_DEFINITION_ARN_opensuse_154:
|
|
||||||
Ref: rBuildsBatchJobDefinitionOpensuse154
|
|
||||||
JOB_DEFINITION_ARN_fedora_38:
|
JOB_DEFINITION_ARN_fedora_38:
|
||||||
Ref: rBuildsBatchJobDefinitionFedora38
|
Ref: rBuildsBatchJobDefinitionFedora38
|
||||||
JOB_DEFINITION_ARN_fedora_39:
|
JOB_DEFINITION_ARN_fedora_39:
|
||||||
Ref: rBuildsBatchJobDefinitionFedora39
|
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:
|
functions:
|
||||||
queueBuilds:
|
queueBuilds:
|
||||||
|
|
|
||||||
|
|
@ -79,14 +79,6 @@ services:
|
||||||
- R_VERSION=${R_VERSION}
|
- R_VERSION=${R_VERSION}
|
||||||
volumes:
|
volumes:
|
||||||
- ../:/r-builds
|
- ../:/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:
|
fedora-38:
|
||||||
image: fedora:38
|
image: fedora:38
|
||||||
command: /r-builds/test/test-yum.sh
|
command: /r-builds/test/test-yum.sh
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue