diff options
| author | Christian König <ckoenig@posteo.de> | 2022-10-01 11:04:26 +0300 |
|---|---|---|
| committer | Christian König <ckoenig@posteo.de> | 2022-10-01 11:04:26 +0300 |
| commit | 3731b65bd59ce73115c8f55c548b01f3c0495af3 (patch) | |
| tree | 5cc60ee29b814f899082380798ce524ece4e663d | |
| parent | 6057b134ae34c44131cd4648b957819d85bb2da0 (diff) | |
Remoce Fedora 34 from tests
Signed-off-by: Christian König <ckoenig@posteo.de>
| -rw-r--r-- | .github/workflows/test.yml | 1 | ||||
| -rw-r--r-- | test/_fedora_34.Dockerfile | 18 | ||||
| -rw-r--r-- | test/tox.fedora_34.ini | 8 |
3 files changed, 0 insertions, 27 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1f83c1b8..bb2d68d5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,7 +54,6 @@ jobs: ubuntu_20, ubuntu_22, centos_8, - fedora_34, fedora_35, fedora_36, ] diff --git a/test/_fedora_34.Dockerfile b/test/_fedora_34.Dockerfile deleted file mode 100644 index 9c90ce7d..00000000 --- a/test/_fedora_34.Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM fedora:34 -RUN dnf install -y git - -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.fedora_34.ini b/test/tox.fedora_34.ini deleted file mode 100644 index d58cb0d4..00000000 --- a/test/tox.fedora_34.ini +++ /dev/null @@ -1,8 +0,0 @@ -[tox] -envlist = py3 - -[testenv] -allowlist_externals = docker -deps = -rrequirements.txt -commands = docker build -f _fedora_34.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 ./test_fedora_support.py |