From 8713135b018fd0464c55dee53393eaae23c195a0 Mon Sep 17 00:00:00 2001
From: Blayne Campbell <blayne@blaynecampbell.com>
Date: Sat, 23 Oct 2021 12:43:20 -0600
Subject: [PATCH] update tests: remove fedora 32, add fedora 34 (#4403)

Signed-off-by: bcambl <blayne@blaynecampbell.com>
---
 .github/workflows/test.yml                            | 2 +-
 test/{_fedora_32.Dockerfile => _fedora_34.Dockerfile} | 2 +-
 test/{tox.fedora_32.ini => tox.fedora_34.ini}         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename test/{_fedora_32.Dockerfile => _fedora_34.Dockerfile} (97%)
 rename test/{tox.fedora_32.ini => tox.fedora_34.ini} (78%)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c2b4dbbc..49f139e1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,7 +28,7 @@ jobs:
     needs: smoke-test
     strategy:
       matrix:
-        distro: [debian_9, debian_10, debian_11, ubuntu_16, ubuntu_18, ubuntu_20, ubuntu_21, centos_7, centos_8, fedora_32, fedora_33]
+        distro: [debian_9, debian_10, debian_11, ubuntu_16, ubuntu_18, ubuntu_20, ubuntu_21, centos_7, centos_8, fedora_33, fedora_34]
     env:
       DISTRO: ${{matrix.distro}}
     steps:
diff --git a/test/_fedora_32.Dockerfile b/test/_fedora_34.Dockerfile
similarity index 97%
rename from test/_fedora_32.Dockerfile
rename to test/_fedora_34.Dockerfile
index e9c2ff2a..96de18da 100644
--- a/test/_fedora_32.Dockerfile
+++ b/test/_fedora_34.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:32
+FROM fedora:34
 
 ENV GITDIR /etc/.pihole
 ENV SCRIPTDIR /opt/pihole
diff --git a/test/tox.fedora_32.ini b/test/tox.fedora_34.ini
similarity index 78%
rename from test/tox.fedora_32.ini
rename to test/tox.fedora_34.ini
index c68e0757..154662cf 100644
--- a/test/tox.fedora_32.ini
+++ b/test/tox.fedora_34.ini
@@ -4,5 +4,5 @@ envlist = py37
 [testenv]
 whitelist_externals = docker
 deps = -rrequirements.txt
-commands = docker build -f _fedora_32.Dockerfile -t pytest_pihole:test_container ../
+commands = docker build -f _fedora_34.Dockerfile -t pytest_pihole:test_container ../
            pytest {posargs:-vv -n auto} ./test_automated_install.py ./test_centos_fedora_common_support.py ./test_fedora_support.py