From eed4b70512fdd77a949fc7262809fd4390295e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Wed, 19 Apr 2023 21:03:12 +0200
Subject: [PATCH] Add Fedora 38 to the test suite
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Christian König <ckoenig@posteo.de>
---
.github/workflows/test.yml | 1 +
test/_fedora_38.Dockerfile | 18 ++++++++++++++++++
test/tox.fedora_38.ini | 8 ++++++++
3 files changed, 27 insertions(+)
create mode 100644 test/_fedora_38.Dockerfile
create mode 100644 test/tox.fedora_38.ini
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cd8a4030..748f09b9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,6 +57,7 @@ jobs:
centos_9,
fedora_36,
fedora_37,
+ fedora_38,
]
env:
DISTRO: ${{matrix.distro}}
diff --git a/test/_fedora_38.Dockerfile b/test/_fedora_38.Dockerfile
new file mode 100644
index 00000000..76f69771
--- /dev/null
+++ b/test/_fedora_38.Dockerfile
@@ -0,0 +1,18 @@
+FROM fedora:38
+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_38.ini b/test/tox.fedora_38.ini
new file mode 100644
index 00000000..0aa7612e
--- /dev/null
+++ b/test/tox.fedora_38.ini
@@ -0,0 +1,8 @@
+[tox]
+envlist = py3
+
+[testenv]
+allowlist_externals = docker
+deps = -rrequirements.txt
+commands = docker buildx build --load --progress plain -f _fedora_38.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