From d96c9c7d7ab8f081a6993993e2e91180303a4b91 Mon Sep 17 00:00:00 2001
From: Jakub Kadlcik <frostyx@email.cz>
Date: Mon, 11 Jan 2021 22:56:04 +0100
Subject: [PATCH] Stop running tests for F27 in favor of F33

---
 hacking/runtests.sh                   |  3 +--
 hacking/titotest-fedora-27/Dockerfile | 35 -------------------------
 hacking/titotest-fedora-33/Dockerfile | 37 +++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 37 deletions(-)
 delete mode 100644 hacking/titotest-fedora-27/Dockerfile
 create mode 100644 hacking/titotest-fedora-33/Dockerfile

diff --git a/hacking/runtests.sh b/hacking/runtests.sh
index f16b939..ad5ea9a 100755
--- a/hacking/runtests.sh
+++ b/hacking/runtests.sh
@@ -62,11 +62,10 @@
 readonly default_python2_distros=(
     centos-6
     centos-7
-    fedora-27
 )
 
 readonly default_python3_distros=(
-    fedora-27
+    fedora-33
     fedora-rawhide
 )
 
diff --git a/hacking/titotest-fedora-27/Dockerfile b/hacking/titotest-fedora-27/Dockerfile
deleted file mode 100644
index 630fd88..0000000
--- a/hacking/titotest-fedora-27/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-FROM fedora:27
-MAINTAINER Steve Kuznetsov <skuznets@redhat.com>
-
-# Manually install python2 deps since spec won't add them
-RUN dnf -y install                 \
-           'dnf-command(builddep)' \
-           git-annex               \
-           python2-devel           \
-           python-mock             \
-           python-nose             \
-           python-blessed          \
-           python-pep8             \
-           python-setuptools       \
-           python-bugzilla         \
-           python2-rpm             \
-           python3-mock            \
-           python3-nose            \
-           python3-blessed         \
-           python3-pep8            \
-	   rsync                   \
-           createrepo_c
-
-RUN useradd sandbox
-RUN git config --system user.email "sandbox@example.com"
-RUN git config --system user.name  "sandbox"
-ADD tito.spec /tmp/tito.spec
-RUN dnf -y builddep /tmp/tito.spec
-RUN dnf clean all
-
-USER sandbox
-VOLUME ["/home/sandbox"]
-WORKDIR /home/sandbox
-
-ENV LANG C
-CMD ["/bin/bash"]
diff --git a/hacking/titotest-fedora-33/Dockerfile b/hacking/titotest-fedora-33/Dockerfile
new file mode 100644
index 0000000..487d4ea
--- /dev/null
+++ b/hacking/titotest-fedora-33/Dockerfile
@@ -0,0 +1,37 @@
+# https://index.docker.io/_/fedora/
+FROM fedora:33
+
+MAINTAINER Jakub Kadlcik <frostyx@email.cz>
+
+# Run an update to work around https://bugzilla.redhat.com/show_bug.cgi?id=1409590
+# TODO: remove this once the Rawhide base image is updated
+RUN dnf -y update
+# Install build dependencies including python2 deps for testing.
+RUN dnf -y install          \
+    'dnf-command(builddep)' \
+    git-annex               \
+    python3-devel           \
+    python3-mock            \
+    python3-nose            \
+    python3-blessed         \
+    python3-pycodestyle     \
+    rsync                   \
+    createrepo_c
+
+RUN useradd sandbox
+RUN git config --system user.email "sandbox@example.com"
+RUN git config --system user.name  "sandbox"
+
+# NOTE: runtests.sh hard-links tito.spec into this directory on-the-fly
+#       to work around https://github.com/dotcloud/docker/issues/1676
+ADD tito.spec /tmp/tito.spec
+
+RUN dnf -y builddep /tmp/tito.spec
+RUN dnf clean all
+
+USER sandbox
+VOLUME ["/home/sandbox"]
+WORKDIR /home/sandbox
+
+ENV LANG C
+CMD ["/bin/bash"]