diff --git a/.github/Dockerfile.c8-network-role b/.github/Dockerfile.c8-network-role deleted file mode 100644 index 6a1d4d7..0000000 --- a/.github/Dockerfile.c8-network-role +++ /dev/null @@ -1,12 +0,0 @@ -FROM quay.io/centos/centos:8 - -RUN dnf -y install dnf-plugins-core epel-release && \ - dnf config-manager --set-enabled powertools && \ - dnf -y upgrade && \ - dnf -y install NetworkManager NetworkManager-wifi \ - procps-ng iproute ansible openssh-server openssh-clients systemd-udev \ - dnsmasq hostapd wpa_supplicant openssl ethtool iputils python3-gobject-base - -VOLUME [ "/sys/fs/cgroup" ] - -CMD ["/usr/sbin/init"] diff --git a/.github/run_test.sh b/.github/run_test.sh index dd66b10..b05d0f1 100755 --- a/.github/run_test.sh +++ b/.github/run_test.sh @@ -4,7 +4,6 @@ set -euo pipefail TEST_SOURCE_DIR="/network-role" C8S_CONTAINER_IMAGE="quay.io/linux-system-roles/c8s-network-role" -C8_CONTAINER_IMAGE="quay.io/linux-system-roles/c8-network-role" C7_CONTAINER_IMAGE="quay.io/linux-system-roles/c7-network-role" PODMAN_OPTS="--systemd=true --privileged" @@ -31,8 +30,8 @@ EOF EXEC_PATH=$(dirname "$(realpath "$0")") PROJECT_PATH=$(dirname "$(realpath "$EXEC_PATH../")") -# Default to CentOS 8 -OS_TYPE=c8 +# Default +OS_TYPE=c8s while [[ $# -gt 0 ]]; do key="$1" @@ -54,9 +53,6 @@ case $OS_TYPE in "c8s") CONTAINER_IMAGE=$C8S_CONTAINER_IMAGE ;; - "c8") - CONTAINER_IMAGE=$C8_CONTAINER_IMAGE - ;; "c7") CONTAINER_IMAGE=$C7_CONTAINER_IMAGE ;; diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index f1c4f70..05be93e 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -15,7 +15,6 @@ jobs: matrix: include: - os: "c7" - - os: "c8" - os: "c8s" steps: