Drop CentOS 7 support

timescale · Nov 13, 2024 · 1fa65a0 · 1fa65a0
1 parent 960139c
commit 1fa65a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 41 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,12 +47,6 @@ jobs:
           # Building TSDB in CI is only supported on Debian/Ubuntu
           skip: ${{ inputs.tsdb-commit != '' }}
           schedule: ${{ !(github.event_name == 'schedule' && github.event.schedule == '0 8 * * 1-4') }}
-        - os: centos
-          version: "7"
-          image: centos-7-x86_64
-          # Building TSDB in CI is only supported on Debian/Ubuntu
-          skip: ${{ inputs.tsdb-commit != '' }}
-          schedule: ${{ !(github.event_name == 'schedule' && github.event.schedule == '0 8 * * 1-4') }}
         - os: debian
           version: "11"
           image: debian-11-amd64
@@ -74,11 +68,6 @@ jobs:
             skip: true
         - container:
             schedule: false
-        # CentOS 7 does not have PostgreSQL 16 packages
-        - container:
-            os: centos
-            version: "7"
-          pgversion: 16
         include:
         # TimescaleDB as of 2.12.0 no longer supports PostgreSQL 12.
         # To allow us to do run CI against PostgreSQL 12, we therefore explicitly
@@ -167,7 +156,7 @@ jobs:
       run: |
         su postgres -c 'OS_NAME=${{ matrix.container.os }} OS_VERSION=${{ matrix.container.version }} tools/testbin -version no -bindir / -pgversions ${{ matrix.pgversion }} ci 2>&1'    
     - name: Run binary update tests (EL)
-      if: ${{ (matrix.container.os == 'rockylinux' || matrix.container.os == 'centos') && matrix.container.version != '9' && (matrix.pgversion >= 13 && (matrix.pgversion <= 16 || ((github.event_name == 'schedule' && github.event.schedule == '0 8 * * 1-4') || inputs.tsdb-commit != ''))) }}
+      if: ${{ (matrix.container.os == 'rockylinux') && matrix.container.version != '9' && (matrix.pgversion >= 13 && (matrix.pgversion <= 16 || ((github.event_name == 'schedule' && github.event.schedule == '0 8 * * 1-4') || inputs.tsdb-commit != ''))) }}
       run: |
         su postgres -c 'OS_NAME=${{ matrix.container.os }} OS_VERSION=${{ matrix.container.version }} tools/testbin -version no -bindir / -pgversions ${{ matrix.pgversion }} rpm_ci 2>&1'
 

diff --git a/docker/ci/setup.sh b/docker/ci/setup.sh
@@ -32,7 +32,7 @@ BUILDER_HOME=$6
 
 # Phase 0 - set platform-specific parameters
 case $OS_NAME in
-    centos | rockylinux)
+    rockylinux)
         PG_BASE=/usr/pgsql-
         ;;
     debian | ubuntu)
@@ -51,34 +51,8 @@ if $privileged; then
     # Phase 2 - platform-specific package installation
     case $OS_NAME in
         # Red Hat Enterprise derivatives
-        centos | rockylinux)
+        rockylinux)
             case $OS_VERSION in
-                7)
-                    export PG_VERSIONS="13 14 15 16 17"
-                    export TSDB_PG_VERSIONS="13 14 15 16 17"
-                    # Postgresql packages require both
-                    # - llvm-toolset-7-clang from centos-release-scl-rh
-                    # - llvm5.0-devel from epel-release
-                    # ¯\_(ツ)_/¯
-                    yum -q -y install centos-release-scl-rh epel-release
-                    yum -q -y install devtoolset-7-gcc llvm-toolset-7-clang-devel llvm-toolset-7-clang-libs
-                    # devtoolset-7 includes a BROKEN sudo!  It even leads with a TODO about its brokenness!
-                    rm -f /opt/rh/devtoolset-7/root/usr/bin/sudo
-                    # for fpm
-                    yum -q -y install rh-ruby26-ruby-devel
-
-                    # TODO Would be nice to be able to resolve all system
-                    #  differences here rather than also in package-rpm.sh -
-                    #  maybe install wrappers in /usr/local/bin or setup ~/.profile .
-                    #  For now, most the knowledge is split.
-                    # Here, we only need `cc` for installing cargo-pgrx below.
-                    set +e      # scl_source has unchecked yet harmless errors?!  ¯\_(ツ)_/¯
-                    . scl_source enable devtoolset-7
-                    # And rh-ruby26 for gem install fpm below.
-                    . scl_source enable rh-ruby26
-                    set -e
-                    ;;
-
                 8)
                     yum -qy install dnf-plugins-core
                     dnf config-manager --enable powertools

diff --git a/tools/testbin b/tools/testbin
@@ -96,7 +96,6 @@ skip_from_version() {
     [ $FROM_VERSION = 1.10.0-dev ] && return
     [ $OS_NAME = debian ] && [ $OS_VERSION = 10 ] && [ `cmp_version $FROM_VERSION` -lt 011100 ] && return
     [ $OS_NAME = ubuntu ] && [ $OS_VERSION = 22.04 ] && [ `cmp_version $FROM_VERSION` -lt 010600 ] && return
-    [ $OS_NAME = centos ] && [ $OS_VERSION = 7 ] && [ `cmp_version $FROM_VERSION` -ge 010800 ] && [ `cmp_version $FROM_VERSION` -le 011100 ] && return
 }
 
 # Requires: