From b62495d89e4632f5118880b912c0de57254114cf Mon Sep 17 00:00:00 2001
From: bcambl <blayne@blaynecampbell.com>
Date: Thu, 21 Jan 2021 20:20:07 -0600
Subject: [PATCH] update tests to fedora 33

Signed-off-by: bcambl <blayne@blaynecampbell.com>
---
 .github/workflows/test.yml                            | 2 +-
 supportedos.txt                                       | 2 +-
 test/{_fedora_31.Dockerfile => _fedora_33.Dockerfile} | 2 +-
 test/{tox.fedora_31.ini => tox.fedora_33.ini}         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename test/{_fedora_31.Dockerfile => _fedora_33.Dockerfile} (96%)
 rename test/{tox.fedora_31.ini => tox.fedora_33.ini} (78%)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8e19e550..d19df5ab 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        distro: [debian_9, debian_10, ubuntu_16, ubuntu_18, ubuntu_20, centos_7, centos_8, fedora_31, fedora_32]
+        distro: [debian_9, debian_10, ubuntu_16, ubuntu_18, ubuntu_20, centos_7, centos_8, fedora_32, fedora_33]
     env:
       DISTRO: ${{matrix.distro}}
     steps:
diff --git a/supportedos.txt b/supportedos.txt
index 1eb1fde6..6d579132 100644
--- a/supportedos.txt
+++ b/supportedos.txt
@@ -1,5 +1,5 @@
 Raspbian=9,10
 Ubuntu=16,18,20
 Debian=9,10
-Fedora=31,32
+Fedora=32,33
 CentOS=7,8
\ No newline at end of file
diff --git a/test/_fedora_31.Dockerfile b/test/_fedora_33.Dockerfile
similarity index 96%
rename from test/_fedora_31.Dockerfile
rename to test/_fedora_33.Dockerfile
index 02dcb733..0a1ac59c 100644
--- a/test/_fedora_31.Dockerfile
+++ b/test/_fedora_33.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:33
 
 ENV GITDIR /etc/.pihole
 ENV SCRIPTDIR /opt/pihole
diff --git a/test/tox.fedora_31.ini b/test/tox.fedora_33.ini
similarity index 78%
rename from test/tox.fedora_31.ini
rename to test/tox.fedora_33.ini
index 36ab10ad..00ea732a 100644
--- a/test/tox.fedora_31.ini
+++ b/test/tox.fedora_33.ini
@@ -4,5 +4,5 @@ envlist = py37
 [testenv]
 whitelist_externals = docker
 deps = -rrequirements.txt
-commands = docker build -f _fedora_31.Dockerfile -t pytest_pihole:test_container ../
+commands = docker build -f _fedora_33.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