From e40985cac69e89d1f69dd62d778818a7e1d644bd Mon Sep 17 00:00:00 2001
From: Larry Gritz <lg@larrygritz.com>
Date: Sun, 7 Jul 2024 08:27:18 -0700
Subject: [PATCH] ci: deal with CentOS 7 EOL and disappearance of yum mirrors

This was breaking CI for us. Hard break for icc/icx tests, since those
REQUIRED a yum install of the intel compilers. Softer undetected break
for all the ASWF <= 2022 containers based on CentOS 7, which were not
failing outright but were failing to install certain optional
packages.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
---
 .github/workflows/ci.yml              |  3 +++
 src/build-scripts/gh-installdeps.bash | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a7ffea3ffd..989d0bcd06 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -296,6 +296,7 @@ jobs:
 
 
   ubuntu:
+    if: 0
     name: "Ubuntu ${{matrix.desc}}"
     strategy:
       fail-fast: false
@@ -485,6 +486,7 @@ jobs:
 
 
   macos:
+    if: 0
     name: "${{matrix.runner}} appleclang${{matrix.aclang}}/C++${{matrix.cxx_std}} py${{matrix.python_ver}} ${{matrix.desc}}"
     strategy:
       fail-fast: false
@@ -564,6 +566,7 @@ jobs:
 
 
   windows:
+    if: 0
     name: "${{matrix.desc}} VS${{matrix.vsver}}"
     strategy:
       fail-fast: false
diff --git a/src/build-scripts/gh-installdeps.bash b/src/build-scripts/gh-installdeps.bash
index 2ac6d6bce4..5a9ff9655b 100755
--- a/src/build-scripts/gh-installdeps.bash
+++ b/src/build-scripts/gh-installdeps.bash
@@ -13,10 +13,21 @@ set -ex
 # Install system packages when those are acceptable for dependencies.
 #
 if [[ "$ASWF_ORG" != ""  ]] ; then
-    # Using ASWF CentOS container
+    # Using ASWF container
 
     #ls /etc/yum.repos.d
 
+    if [[ "$ASWF_VFXPLATFORM_VERSION" == "2021" || "$ASWF_VFXPLATFORM_VERSION" == "2022" ]] ; then
+        # CentOS 7 based containers need the now-nonexistant centos repo to be
+        # excluded or all the subsequent yum install commands will fail.
+        echo "/etc/yum.repos.d/CentOS-Base.repo ----------------"
+        cat /etc/yum.repos.d/CentOS-Base.repo
+        echo "Adjusting CentOS-Base.repo"
+        # yum-config-manager --disable centos-sclo-rh/x86_64 && true
+        yum-config-manager --disable centos-sclo-rh && true
+        sed -i 's,^mirrorlist=,#,; s,^#baseurl=http://mirror\.centos\.org/centos/$releasever,baseurl=https://vault.centos.org/7.9.2009,' /etc/yum.repos.d/CentOS-Base.repo
+    fi
+
     sudo yum install -y giflib giflib-devel && true
     if [[ "${USE_OPENCV}" != "0" ]] ; then
         sudo yum install -y opencv opencv-devel && true