From cfc0d0717342342fa5f45df2ec29bc0f3a39685e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sat, 8 Jun 2024 12:57:45 +0200 Subject: [PATCH] Remove CentOS8 from test suite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- .github/workflows/test.yml | 1 - test/_centos_8.Dockerfile | 18 ------------------ test/tox.centos_8.ini | 8 -------- 3 files changed, 27 deletions(-) delete mode 100644 test/_centos_8.Dockerfile delete mode 100644 test/tox.centos_8.ini diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 568c4669..5a5ee85f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,7 +63,6 @@ jobs: ubuntu_22, ubuntu_23, ubuntu_24, - centos_8, centos_9, fedora_39, fedora_40, diff --git a/test/_centos_8.Dockerfile b/test/_centos_8.Dockerfile deleted file mode 100644 index a07a67e9..00000000 --- a/test/_centos_8.Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM quay.io/centos/centos:stream8 -RUN yum install -y git initscripts - -ENV GITDIR /etc/.pihole -ENV SCRIPTDIR /opt/pihole - -RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole -ADD . $GITDIR -RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/ -ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR - -RUN true && \ - chmod +x $SCRIPTDIR/* - -ENV SKIP_INSTALL true -ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net - -#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \ diff --git a/test/tox.centos_8.ini b/test/tox.centos_8.ini deleted file mode 100644 index 85ae1ffb..00000000 --- a/test/tox.centos_8.ini +++ /dev/null @@ -1,8 +0,0 @@ -[tox] -envlist = py3 - -[testenv:py3] -allowlist_externals = docker -deps = -rrequirements.txt -commands = docker buildx build --load --progress plain -f _centos_8.Dockerfile -t pytest_pihole:test_container ../ - pytest {posargs:-vv -n auto} ./test_any_automated_install.py ./test_any_utils.py ./test_centos_fedora_common_support.py