From f8bfd59f11332b664c954ebfb2ed1586fbd3d070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Tue, 7 Nov 2023 22:24:34 +0100
Subject: [PATCH 1/2] Drop Fedora 36 and add Fedora 39 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                            | 2 +-
 test/{_fedora_36.Dockerfile => _fedora_39.Dockerfile} | 2 +-
 test/{tox.fedora_36.ini => tox.fedora_39.ini}         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename test/{_fedora_36.Dockerfile => _fedora_39.Dockerfile} (97%)
 rename test/{tox.fedora_36.ini => tox.fedora_39.ini} (81%)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 35ed0c30..67377255 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,9 +57,9 @@ jobs:
             ubuntu_23,
             centos_8,
             centos_9,
-            fedora_36,
             fedora_37,
             fedora_38,
+            fedora_39,
           ]
     env:
       DISTRO: ${{matrix.distro}}
diff --git a/test/_fedora_36.Dockerfile b/test/_fedora_39.Dockerfile
similarity index 97%
rename from test/_fedora_36.Dockerfile
rename to test/_fedora_39.Dockerfile
index 847767e7..1727a3aa 100644
--- a/test/_fedora_36.Dockerfile
+++ b/test/_fedora_39.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:39
 RUN dnf install -y git initscripts
 
 ENV GITDIR /etc/.pihole
diff --git a/test/tox.fedora_36.ini b/test/tox.fedora_39.ini
similarity index 81%
rename from test/tox.fedora_36.ini
rename to test/tox.fedora_39.ini
index 515487ed..7a538371 100644
--- a/test/tox.fedora_36.ini
+++ b/test/tox.fedora_39.ini
@@ -1,8 +1,8 @@
 [tox]
 envlist = py3
 
-[testenv:py3]
+[testenv]
 allowlist_externals = docker
 deps = -rrequirements.txt
-commands = docker buildx build --load --progress plain -f _fedora_36.Dockerfile -t pytest_pihole:test_container ../
+commands = docker buildx build --load --progress plain -f _fedora_39.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

From 7b6f0d1596f879b65552c5deddc0dc620b290d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Sun, 28 Jan 2024 16:56:57 +0100
Subject: [PATCH 2/2] Also remove Fedora 37
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 |  3 +--
 test/_fedora_37.Dockerfile | 18 ------------------
 test/tox.fedora_37.ini     |  8 --------
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 test/_fedora_37.Dockerfile
 delete mode 100644 test/tox.fedora_37.ini

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 67377255..fabf380e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,8 +57,7 @@ jobs:
             ubuntu_23,
             centos_8,
             centos_9,
-            fedora_37,
-            fedora_38,
+             fedora_38,
             fedora_39,
           ]
     env:
diff --git a/test/_fedora_37.Dockerfile b/test/_fedora_37.Dockerfile
deleted file mode 100644
index b4f939ba..00000000
--- a/test/_fedora_37.Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM fedora:37
-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_37.ini b/test/tox.fedora_37.ini
deleted file mode 100644
index 2a8ef398..00000000
--- a/test/tox.fedora_37.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[tox]
-envlist = py3
-
-[testenv]
-allowlist_externals = docker
-deps = -rrequirements.txt
-commands = docker buildx build --load --progress plain -f _fedora_37.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