Skip to content

Commit

Permalink
Merge pull request #224 from simondeziel/c7-eol
Browse files Browse the repository at this point in the history
CentOS 7 (EOL: 2024-06-30)
  • Loading branch information
tomponline authored Jul 2, 2024
2 parents 8a89689 + 67e24a2 commit 0ec71be
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 348 deletions.
13 changes: 1 addition & 12 deletions .github/workflows/image-centos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,17 @@ on:

jobs:
centos:
runs-on: ${{ matrix.architecture == 'arm64' && 'Ubuntu_ARM64_4C_16G_01' || 'ubuntu-20.04' }}
runs-on: ${{ matrix.architecture == 'arm64' && 'Ubuntu_ARM64_4C_16G_01' || 'ubuntu-latest' }}
strategy:
fail-fast: false
matrix:
release:
- 7 # CentOS 7 tests require cgroups v1. They will pass on ubuntu-20.04 runner.
- 9-Stream
variant:
- default
- cloud
architecture:
- ${{ (inputs.build-arm64 == true || github.event.schedule == '0 0 * * 1') && 'arm64' ||'amd64' }}
exclude:
- {architecture: arm64, release: 7}
env:
type: "container"
distro: "${{ github.job }}"
Expand Down Expand Up @@ -62,14 +59,6 @@ jobs:
[ "${ARCH}" = "arm64" ] && IMAGE_ARCH="aarch64"
EXTRA_ARGS=""
if [ "${RELEASE}" = "7" ] && [ "${ARCH}" != "amd64" ]; then
EXTRA_ARGS="-o source.url=http://mirror.math.princeton.edu/pub/centos-altarch/ -o source.skip_verification=true"
fi
if [ "${RELEASE}" = "7" ]; then
EXTRA_ARGS="${EXTRA_ARGS} -o packages.manager=yum"
fi
if [ "${RELEASE}" = "9-Stream" ]; then
EXTRA_ARGS="${EXTRA_ARGS} -o source.variant=boot"
EXTRA_ARGS="${EXTRA_ARGS} -o source.url=https://mirror1.hs-esslingen.de/pub/Mirrors/centos-stream"
Expand Down
6 changes: 0 additions & 6 deletions bin/test-image
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,6 @@ for url in $(lxc query "/1.0/instances" | jq -r .[] | grep "${TEST_IMAGE}"); do
continue
fi

# Skip CentOS 7 VMs due to racy agent
if [ "${TYPE}" = "vm" ] && [ "${DISTRO}" = "centos" ] && [ "${RELEASE}" = "7" ]; then
echo "===> SKIP: CentOS 7 has an unstable agent: ${name}"
continue
fi

# Systemd cleanliness.
if lxc exec "${name}" -- test -d /run/systemd/system/; then
if lxc exec "${name}" -- systemctl --failed 2>&1 | grep -qwF 'failed'; then
Expand Down
Loading

0 comments on commit 0ec71be

Please sign in to comment.