diff --git a/.github/workflows/distro-matrix.yml b/.github/workflows/distro-matrix.yml index 6c1b98d..987d991 100644 --- a/.github/workflows/distro-matrix.yml +++ b/.github/workflows/distro-matrix.yml @@ -37,8 +37,6 @@ jobs: image: ubuntu:22.04 - name: ubuntu-24.04 image: ubuntu:24.04 - - name: debian-11 - image: debian:11 - name: debian-12 image: debian:12 @@ -116,7 +114,7 @@ jobs: - name: Install dependencies run: | - dnf install -y \ + dnf install -y --allowerasing \ bash iproute iputils bind-utils curl sudo procps-ng ca-certificates - name: Setup scripts @@ -275,13 +273,18 @@ jobs: image: ${{ matrix.distro.image }} steps: + # actions/checkout unpacks the repository with tar, which these images lack. + - name: Install tar for checkout + run: zypper --non-interactive install tar gzip + - name: Checkout uses: actions/checkout@v7.0.1 - name: Install dependencies run: | zypper --non-interactive install \ - bash iproute2 iputils bind-utils curl sudo procps ca-certificates + bash iproute2 iputils bind-utils curl sudo procps ca-certificates \ + findutils grep sed gawk coreutils hostname - name: Setup scripts run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 98402bb..bb267d2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -70,7 +70,6 @@ jobs: - ubuntu:20.04 - ubuntu:22.04 - ubuntu:24.04 - - debian:11 - debian:12 container: diff --git a/tests/distro-matrix.json b/tests/distro-matrix.json index e971aba..7bc40ca 100644 --- a/tests/distro-matrix.json +++ b/tests/distro-matrix.json @@ -23,13 +23,6 @@ "network_manager": "NetworkManager", "init": "systemd" }, - { - "name": "debian-11", - "image": "debian:11", - "package_manager": "apt", - "network_manager": "ifupdown", - "init": "systemd" - }, { "name": "debian-12", "image": "debian:12", diff --git a/tests/run-container-tests.sh b/tests/run-container-tests.sh index 6a56ad9..7fdc1d9 100644 --- a/tests/run-container-tests.sh +++ b/tests/run-container-tests.sh @@ -40,7 +40,6 @@ declare -A DISTROS=( ["ubuntu-20.04"]="ubuntu:20.04" ["ubuntu-22.04"]="ubuntu:22.04" ["ubuntu-24.04"]="ubuntu:24.04" - ["debian-11"]="debian:11" ["debian-12"]="debian:12" # RHEL family ["fedora-39"]="fedora:39" @@ -73,7 +72,7 @@ get_install_cmd() { echo "apt-get update && apt-get install -y bash iproute2 iputils-ping dnsutils curl sudo procps" ;; fedora:*|rockylinux:*|almalinux:*) - echo "dnf install -y bash iproute iputils bind-utils curl sudo procps-ng" + echo "dnf install -y --allowerasing bash iproute iputils bind-utils curl sudo procps-ng" ;; archlinux:*) echo "pacman -Syu --noconfirm && pacman -S --noconfirm bash iproute2 iputils bind curl sudo procps-ng" @@ -82,7 +81,7 @@ get_install_cmd() { echo "apk add --no-cache bash iproute2 iputils bind-tools curl sudo procps coreutils" ;; opensuse/*:*) - echo "zypper --non-interactive install bash iproute2 iputils bind-utils curl sudo procps" + echo "zypper --non-interactive install bash iproute2 iputils bind-utils curl sudo procps findutils grep sed gawk coreutils hostname" ;; *) echo "echo 'Unknown distro'"