From 706407b2e17b340a9843f6185f2893943bd01416 Mon Sep 17 00:00:00 2001
From: Frank Scheiner <scheiner@hlrs.de>
Date: Thu, 11 Jul 2024 22:05:56 +0200
Subject: [PATCH 1/3] Retire CentOS 7 and CentOS Stream 8 for our CIs

New default is Rocky Linux 8.
---
 .github/workflows/build-test-deploy.yml |  6 +--
 .travis.yml                             |  6 +--
 travis-ci/make_rpms.sh                  |  2 -
 travis-ci/make_source_tarballs.sh       |  2 -
 travis-ci/run_task_inside_docker.sh     | 61 ++++++-------------------
 5 files changed, 21 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
index c0fc81073..2d1c21d6d 100644
--- a/.github/workflows/build-test-deploy.yml
+++ b/.github/workflows/build-test-deploy.yml
@@ -16,7 +16,7 @@ jobs:
       # Don't cancel the remaining running jobs if some job(s) fail(s)
       fail-fast: false
       matrix:
-        image: ['centos:centos7', 'rockylinux:8', 'quay.io/centos/centos:stream8']
+        image: ['rockylinux:8']
         components: ['udt,myproxy,ssh', 'gram5']
         # Ignore UDT for the CentOS Stream 9 case because libnice is not available there yet
         include:
@@ -52,11 +52,11 @@ jobs:
       
       # SSH key recipe from https://www.webfactory.de/blog/use-ssh-key-for-private-repositories-in-github-actions
       - name: Establish ssh and upload source tarballs
-        # Only run this step for the centos:centos7 case and
+        # Only run this step for the rockylinux:8 case and
         # for only one component selection (must be the same as for the previous step!) and
         # only when a tag was created
         if: |
-          contains(matrix.image , 'centos:centos7') &&
+          contains(matrix.image , 'rockylinux:8') &&
           contains(matrix.components , 'gram5') &&
           contains(github.ref , 'refs/tags/')
         env:
diff --git a/.travis.yml b/.travis.yml
index f2443fb30..66ec3b43a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ jobs:
       arch:
         - ppc64le
       env:
-        - IMAGE=centos:centos7 TASK=tests COMPONENTS=udt,myproxy,ssh
+        - IMAGE=rockylinux:8 TASK=tests COMPONENTS=udt,myproxy,ssh
       stage: test
       services:
         - docker
@@ -47,10 +47,10 @@ jobs:
       arch:
         - ppc64le
       env:
-        - IMAGE=centos:centos7 TASK=tests COMPONENTS=gram5
+        - IMAGE=rockylinux:8 TASK=tests COMPONENTS=gram5
 
     - <<: *run_tests
       arch:
         - arm64
       env:
-        - IMAGE=centos:centos7 TASK=tests COMPONENTS=gram5
+        - IMAGE=rockylinux:8 TASK=tests COMPONENTS=gram5
diff --git a/travis-ci/make_rpms.sh b/travis-ci/make_rpms.sh
index 7086e489d..f4974a039 100755
--- a/travis-ci/make_rpms.sh
+++ b/travis-ci/make_rpms.sh
@@ -17,8 +17,6 @@ usage()
 umask 022
 
 case $(</etc/redhat-release) in
-    CentOS*\ 7*) OS=centos7 ;;
-    CentOS\ Stream*\ 8*) OS=centos-stream-8;;
     CentOS\ Stream*\ 9*) OS=centos-stream-9;;
     Rocky\ Linux*\ 8*) OS=rockylinux8 ;;
     Rocky\ Linux*\ 9*) OS=rockylinux9 ;;
diff --git a/travis-ci/make_source_tarballs.sh b/travis-ci/make_source_tarballs.sh
index b689ba173..1c8de8747 100755
--- a/travis-ci/make_source_tarballs.sh
+++ b/travis-ci/make_source_tarballs.sh
@@ -11,8 +11,6 @@
 set -eu
 
 case $(</etc/redhat-release) in
-    CentOS*\ 7*) OS=centos7 ;;
-    CentOS\ Stream*\ 8*) OS=centos-stream-8;;
     CentOS\ Stream*\ 9*) OS=centos-stream-9;;
     Rocky\ Linux*\ 8*) OS=rockylinux8 ;;
     Rocky\ Linux*\ 9*) OS=rockylinux9 ;;
diff --git a/travis-ci/run_task_inside_docker.sh b/travis-ci/run_task_inside_docker.sh
index 172e9d3c0..a6f0e22dc 100755
--- a/travis-ci/run_task_inside_docker.sh
+++ b/travis-ci/run_task_inside_docker.sh
@@ -9,17 +9,6 @@ COMPONENTS=${3-}
 set -e
 
 case $(</etc/redhat-release) in
-    CentOS*\ 7*)
-
-        OS=centos7
-        release_ver=el7
-        ;;
-
-    CentOS\ Stream*\ 8*)
-
-        OS=centos-stream-8
-        release_ver=el8
-        ;;
 
     CentOS\ Stream*\ 9*)
 
@@ -45,8 +34,6 @@ esac
 # EPEL required for UDT
 case $OS in
     # from `https://docs.fedoraproject.org/en-US/epel/#_quickstart`
-    centos7)  yum -y install epel-release
-              ;;
     rockylinux8)
               dnf -y install dnf-plugins-core
               dnf config-manager --set-enabled powertools
@@ -57,11 +44,6 @@ case $OS in
               dnf config-manager --set-enabled crb
               dnf -y install epel-release
               ;;
-    centos-stream-8)
-              dnf -y install dnf-plugins-core
-              dnf config-manager --set-enabled powertools
-              dnf -y install epel-release epel-next-release
-              ;;
     centos-stream-9)
               dnf -y install dnf-plugins-core
               dnf config-manager --set-enabled crb
@@ -79,23 +61,19 @@ packages=(gcc gcc-c++ make autoconf automake libtool \
           'perl(URI)' file sudo bison patch curl \
           pam pam-devel libedit libedit-devel)
 
-if [[ $OS != *7 ]]; then
-
-    # provides `cmp` used by `packaging/git-dirt-filter`
-    packages+=(diffutils)
-    if [[ $OS == *9 ]]; then
-
-        # also install "zlib zlib-devel" because it's needed for `configure`ing
-        # "gridftp/server/src"
-        packages+=(zlib zlib-devel)
-        # "perl-English" isn't installed by default, so install it explicitly,
-        # because needed for "gridmap-tools-test.pl"
-        packages+=(perl-English)
-        # "perl-Sys-Hostname" isn't installed by default, so install it explicitly,
-        # because needed for globus_ftp_client test scripta.
-        # see https://github.com/fscheiner/gct/runs/5144915195?check_suite_focus=true#step:3:15649
-        packages+=(perl-Sys-Hostname)
-    fi
+# provides `cmp` used by `packaging/git-dirt-filter`
+packages+=(diffutils)
+if [[ $OS == *9 ]]; then
+
+	# also install "zlib zlib-devel" because it's needed for `configure`ing
+	# "gridftp/server/src"
+	packages+=(zlib zlib-devel)
+	# "perl-English" isn't installed by default, so install it explicitly,
+	# because needed for "gridmap-tools-test.pl"
+	packages+=(perl-English)
+	# "perl-Sys-Hostname" isn't installed by default, so install it explicitly,
+	# because needed for globus_ftp_client test scripts.
+	packages+=(perl-Sys-Hostname)
 fi
 
 if [[ $TASK == tests ]]; then
@@ -123,12 +101,7 @@ elif [[ $TASK == *rpms ]]; then
     # for myproxy:
     packages+=(pam-devel voms-devel cyrus-sasl-devel openldap-devel voms-clients initscripts)
     # for globus-net-manager:
-    if [[ $OS == *7 ]]; then
-
-        packages+=(python-devel)
-    else
-        packages+=(python3-devel)
-    fi
+    packages+=(python3-devel)
     # for globus-gram-audit:
     packages+=('perl(DBI)')
     # for globus-scheduler-event-generator:
@@ -144,11 +117,7 @@ elif [[ $TASK == *rpms ]]; then
     packages+=(pam libedit libedit-devel)
 fi
 
-if [[ $OS == *7 ]]; then
-	yum -y -d1 install "${packages[@]}"
-else
-	dnf --allowerasing -y -d1 install "${packages[@]}"
-fi
+dnf --allowerasing -y -d1 install "${packages[@]}"
 
 # UID of travis user inside needs to match UID of travis user outside
 getent passwd travis > /dev/null || useradd travis -u $TRAVISUID -o

From b09256939b2f19d15b35031e74ee4e76e680c7ba Mon Sep 17 00:00:00 2001
From: Frank Scheiner <scheiner@hlrs.de>
Date: Thu, 11 Jul 2024 22:56:26 +0200
Subject: [PATCH 2/3] Use rockylinux:9 for ppc64le

Looks like there are no rockylinux:8 Docker images available for ppc64le.
---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 66ec3b43a..1ba1f27ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ jobs:
       arch:
         - ppc64le
       env:
-        - IMAGE=rockylinux:8 TASK=tests COMPONENTS=udt,myproxy,ssh
+        - IMAGE=ppc64le/rockylinux:9 TASK=tests COMPONENTS=udt,myproxy,ssh
       stage: test
       services:
         - docker
@@ -42,15 +42,17 @@ jobs:
     - <<: *run_tests
       arch:
         - arm64
+      env:
+        - IMAGE=arm64v8/rockylinux:8 TASK=tests COMPONENTS=udt,myproxy,ssh
 
     - <<: *run_tests
       arch:
         - ppc64le
       env:
-        - IMAGE=rockylinux:8 TASK=tests COMPONENTS=gram5
+        - IMAGE=ppc64le/rockylinux:9 TASK=tests COMPONENTS=gram5
 
     - <<: *run_tests
       arch:
         - arm64
       env:
-        - IMAGE=rockylinux:8 TASK=tests COMPONENTS=gram5
+        - IMAGE=arm64v8/rockylinux:8 TASK=tests COMPONENTS=gram5

From 1a7e2199d8cd1598e3e3db61ac2ba5e7804762a4 Mon Sep 17 00:00:00 2001
From: Frank Scheiner <scheiner@hlrs.de>
Date: Fri, 12 Jul 2024 22:12:48 +0200
Subject: [PATCH 3/3] Leave out builds on ppc64le for now

Those are very often taking longer than 50 mins, requiring multiple tries
to complete on Travis CI. It's unclear if the ppc64le runners are just
overbooked or generally slower than the arm64 ones (unlikely).
---
 .travis.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ba1f27ed..915a11bea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,11 @@ jobs:
     - &run_tests
       # Template; subsequent uses modify 'env'
       arch:
-        - ppc64le
+        #- ppc64le
+        - arm64
       env:
-        - IMAGE=ppc64le/rockylinux:9 TASK=tests COMPONENTS=udt,myproxy,ssh
+        #- IMAGE=rockylinux:9 TASK=tests COMPONENTS=udt,myproxy,ssh
+        - IMAGE=rockylinux:8 TASK=tests COMPONENTS=udt,myproxy,ssh
       stage: test
       services:
         - docker
@@ -39,20 +41,20 @@ jobs:
       script:
       - travis-ci/setup_tasks.sh
 
-    - <<: *run_tests
-      arch:
-        - arm64
-      env:
-        - IMAGE=arm64v8/rockylinux:8 TASK=tests COMPONENTS=udt,myproxy,ssh
+#    - <<: *run_tests
+#      arch:
+#        - arm64
+#      env:
+#        - IMAGE=rockylinux:8 TASK=tests COMPONENTS=udt,myproxy,ssh
 
-    - <<: *run_tests
-      arch:
-        - ppc64le
-      env:
-        - IMAGE=ppc64le/rockylinux:9 TASK=tests COMPONENTS=gram5
+#    - <<: *run_tests
+#      arch:
+#        - ppc64le
+#      env:
+#        - IMAGE=rockylinux:9 TASK=tests COMPONENTS=gram5
 
     - <<: *run_tests
       arch:
         - arm64
       env:
-        - IMAGE=arm64v8/rockylinux:8 TASK=tests COMPONENTS=gram5
+        - IMAGE=rockylinux:8 TASK=tests COMPONENTS=gram5