Skip to content

Commit

Permalink
ci: deal with CentOS 7 EOL and disappearance of yum mirrors
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
lgritz committed Jul 7, 2024
1 parent 0b4e015 commit e40985c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ jobs:
ubuntu:
if: 0
name: "Ubuntu ${{matrix.desc}}"
strategy:
fail-fast: false
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -564,6 +566,7 @@ jobs:
windows:
if: 0
name: "${{matrix.desc}} VS${{matrix.vsver}}"
strategy:
fail-fast: false
Expand Down
13 changes: 12 additions & 1 deletion src/build-scripts/gh-installdeps.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e40985c

Please sign in to comment.