Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add Fedora 35 and 36, remove 34 to/from the test suite (#4952)

Browse source
This commit is contained in:
Dan Schaper 2022-10-01 13:43:13 -07:00 committed by GitHub
commit 71b560667b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/test.yml vendored
View file

@ -48,7 +48,15 @@ jobs:
fail-fast: false
matrix:
distro:
[debian_10, debian_11, ubuntu_20, ubuntu_22, centos_8, fedora_34]
[
debian_10,
debian_11,
ubuntu_20,
ubuntu_22,
centos_8,
fedora_35,
fedora_36,
]
env:
DISTRO: ${{matrix.distro}}
steps:

4
test/_fedora_34.Dockerfile → test/_fedora_35.Dockerfile
View file

@ -1,5 +1,5 @@
FROM fedora:34
RUN dnf install -y git
FROM fedora:35
RUN dnf install -y git initscripts
ENV GITDIR /etc/.pihole
ENV SCRIPTDIR /opt/pihole

18
test/_fedora_36.Dockerfile Normal file
View file

@ -0,0 +1,18 @@
FROM fedora:36
RUN dnf 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 && \

2
test/tox.fedora_34.ini → test/tox.fedora_35.ini
View file

@ -4,5 +4,5 @@ envlist = py3
[testenv]
allowlist_externals = docker
deps = -rrequirements.txt
commands = docker build -f _fedora_34.Dockerfile -t pytest_pihole:test_container ../
commands = docker build -f _fedora_35.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

8
test/tox.fedora_36.ini Normal file
View file

@ -0,0 +1,8 @@
[tox]
envlist = py3
[testenv]
allowlist_externals = docker
deps = -rrequirements.txt
commands = docker build -f _fedora_36.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