diff options
| author | Christian König <ckoenig@posteo.de> | 2022-06-26 00:04:16 +0300 |
|---|---|---|
| committer | Christian König <ckoenig@posteo.de> | 2022-06-26 00:04:16 +0300 |
| commit | 8c498acd4c4c411920a56b29b1c57008a8d140de (patch) | |
| tree | 9a192e1e43032bff1c4622a57d2266972e786b6e | |
| parent | f9d1893f9677a7797fde5f139c67aae1c6e4c46b (diff) | |
Re-add Ubuntu21 tests
Signed-off-by: Christian König <ckoenig@posteo.de>
| -rw-r--r-- | .github/workflows/test.yml | 2 | ||||
| -rw-r--r-- | test/_ubuntu_21.Dockerfile | 18 | ||||
| -rw-r--r-- | test/tox.ubuntu_21.ini | 8 |
3 files changed, 27 insertions, 1 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ed282154..436976e1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,7 @@ jobs: needs: smoke-test strategy: matrix: - distro: [debian_10, debian_11, ubuntu_18, ubuntu_20, ubuntu_22, centos_8, fedora_34] + distro: [debian_10, debian_11, ubuntu_18, ubuntu_20, ubuntu_21, ubuntu_22, centos_8, fedora_34] env: DISTRO: ${{matrix.distro}} steps: diff --git a/test/_ubuntu_21.Dockerfile b/test/_ubuntu_21.Dockerfile new file mode 100644 index 00000000..6d4d7fbc --- /dev/null +++ b/test/_ubuntu_21.Dockerfile @@ -0,0 +1,18 @@ +FROM buildpack-deps:impish-scm + +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 +ENV DEBIAN_FRONTEND=noninteractive + +RUN true && \ + chmod +x $SCRIPTDIR/* + +ENV PH_TEST 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.ubuntu_21.ini b/test/tox.ubuntu_21.ini new file mode 100644 index 00000000..070d3a72 --- /dev/null +++ b/test/tox.ubuntu_21.ini @@ -0,0 +1,8 @@ +[tox] +envlist = py38 + +[testenv] +whitelist_externals = docker +deps = -rrequirements.txt +commands = docker build -f _ubuntu_21.Dockerfile -t pytest_pihole:test_container ../ + pytest {posargs:-vv -n auto} ./test_any_automated_install.py ./test_any_utils.py |