diff options
| author | Dan Schaper <dan.schaper@pi-hole.net> | 2022-10-01 23:43:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-01 23:43:13 +0300 |
| commit | 71b560667b9a08758acb4d6d5d1a4f653717c2ca (patch) | |
| tree | e2be9947c839c7610d1281e8a21851083bca066c | |
| parent | 9dd51b79b5ab70f4f274bc68c85735bedc172379 (diff) | |
| parent | 3731b65bd59ce73115c8f55c548b01f3c0495af3 (diff) | |
Add Fedora 35 and 36, remove 34 to/from the test suite (#4952)
| -rw-r--r-- | .github/workflows/test.yml | 10 | ||||
| -rw-r--r-- | test/_fedora_35.Dockerfile (renamed from test/_fedora_34.Dockerfile) | 4 | ||||
| -rw-r--r-- | test/_fedora_36.Dockerfile | 18 | ||||
| -rw-r--r-- | test/tox.fedora_35.ini (renamed from test/tox.fedora_34.ini) | 2 | ||||
| -rw-r--r-- | test/tox.fedora_36.ini | 8 |
5 files changed, 38 insertions, 4 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 442f1c0d..bb2d68d5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: diff --git a/test/_fedora_34.Dockerfile b/test/_fedora_35.Dockerfile index 9c90ce7d..83c17650 100644 --- a/test/_fedora_34.Dockerfile +++ b/test/_fedora_35.Dockerfile @@ -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 diff --git a/test/_fedora_36.Dockerfile b/test/_fedora_36.Dockerfile new file mode 100644 index 00000000..847767e7 --- /dev/null +++ b/test/_fedora_36.Dockerfile @@ -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 && \ diff --git a/test/tox.fedora_34.ini b/test/tox.fedora_35.ini index d58cb0d4..5e90426d 100644 --- a/test/tox.fedora_34.ini +++ b/test/tox.fedora_35.ini @@ -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 diff --git a/test/tox.fedora_36.ini b/test/tox.fedora_36.ini new file mode 100644 index 00000000..1d250f82 --- /dev/null +++ b/test/tox.fedora_36.ini @@ -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 |