Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/distro-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Comment thread
hyperpolymath marked this conversation as resolved.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ jobs:
- ubuntu:20.04
- ubuntu:22.04
- ubuntu:24.04
- debian:11
- debian:12

container:
Expand Down
7 changes: 0 additions & 7 deletions tests/distro-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions tests/run-container-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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'"
Expand Down
Loading