From 3ceeb47333f2ed8e5dc17a3a520de46d895b9bcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Thu, 10 Jun 2021 08:07:55 +0200
Subject: [PATCH] tests: change all mentions of Fedora 32 to Fedora 33

Fedora 32 is EOL, let's use Fedora 33. (Fedora 34 is not yet
100% supported in composer).
---
 HACKING.md                    | 10 +++++-----
 test/integration/test_koji.py | 20 ++++++++++----------
 test/make-tags.sh             | 16 ++++++++--------
 test/unit/test_builder.py     |  4 ++--
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/HACKING.md b/HACKING.md
index 40d023f..1bf174d 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -92,7 +92,7 @@ Specifically:
  * destination tag, which contains the list of packages
 
 A helper script will create a minimum set that is necessary to build
-an image call `Fedora-Cloud` for `f32-candidate`:
+an image call `Fedora-Cloud` for `f33-candidate`:
 
 ```sh
 test/make-tags.sh
@@ -121,11 +121,11 @@ koji --server=http://localhost:8080/kojihub \
 	 --authtype=password \
 	 osbuild-image \
 	 Fedora-Cloud \
-	 32 \
-	 fedora-32 \
-	 f32-candidate \
+	 33 \
+	 fedora-33 \
+	 f33-candidate \
 	 x86_64 \
-	 --repo 'http://download.fedoraproject.org/pub/fedora/linux/releases/32/Everything/$arch/os/' \
+	 --repo 'http://download.fedoraproject.org/pub/fedora/linux/releases/33/Everything/$arch/os/' \
 	 --image-type qcow2 \
 	 --release 1
 ```
diff --git a/test/integration/test_koji.py b/test/integration/test_koji.py
index 7e4a9ef..2dba022 100644
--- a/test/integration/test_koji.py
+++ b/test/integration/test_koji.py
@@ -8,7 +8,7 @@ import unittest
 import subprocess
 
 
-F32_REPO = "http://download.fedoraproject.org/pub/fedora/linux/releases/32/Everything/$arch/os"
+F33_REPO = "http://download.fedoraproject.org/pub/fedora/linux/releases/33/Everything/$arch/os"
 
 RHEL_REPOS = [
     "http://download.devel.redhat.com/released/RHEL-8/8.2.0/BaseOS/x86_64/os/",
@@ -80,16 +80,16 @@ class TestIntegration(unittest.TestCase):
     @unittest.skipUnless(is_fedora(), "no cross builds")
     def test_compose_fedora(self):
         """Successful Fedora compose"""
-        # Simple test of a successful compose of F32
-        # Needs the f32-candidate tag be setup properly
+        # Simple test of a successful compose of F33
+        # Needs the f33-candidate tag be setup properly
 
         res = self.koji("Fedora-Cloud",
-                        "32",
-                        "fedora-32",
-                        "f32-candidate",
+                        "33",
+                        "fedora-33",
+                        "f33-candidate",
                         "x86_64",
                         "--wait",
-                        repo=F32_REPO)
+                        repo=F33_REPO)
         self.check_res(res)
 
     @unittest.skipUnless(is_rhel(), "no cross builds")
@@ -104,7 +104,7 @@ class TestIntegration(unittest.TestCase):
         res = self.koji("RHEL-Cloud",
                         "8",
                         "rhel-8",
-                        "f32-candidate",
+                        "f33-candidate",
                         "x86_64",
                         "--wait",
                         *repos)
@@ -114,8 +114,8 @@ class TestIntegration(unittest.TestCase):
         """Unknown Tag check"""
         # Check building an unknown tag fails
         res = self.koji("Fedora-Cloud",
-                        "32",
-                        "fedora-32",
+                        "33",
+                        "fedora-33",
                         "UNKNOWNTAG",
                         "x86_64")
         self.check_fail(res)
diff --git a/test/make-tags.sh b/test/make-tags.sh
index 5919889..4c2e37e 100755
--- a/test/make-tags.sh
+++ b/test/make-tags.sh
@@ -5,14 +5,14 @@ KOJI_SERVER=${KOJI_SERVER:-http://localhost:8080/kojihub}
 
 KOJI="koji --server=${KOJI_SERVER} --user=kojiadmin --password=kojipass --authtype=password"
 
-$KOJI add-tag f32
-$KOJI add-tag --parent f32 f32-candidate
-$KOJI add-tag --parent f32 --arches=x86_64 f32-build
-$KOJI add-target f32-candidate f32-build f32-candidate
+$KOJI add-tag f33
+$KOJI add-tag --parent f33 f33-candidate
+$KOJI add-tag --parent f33 --arches=x86_64 f33-build
+$KOJI add-target f33-candidate f33-build f33-candidate
 
-$KOJI add-pkg --owner kojiadmin f32-candidate Fedora-Cloud
-$KOJI add-pkg --owner kojiadmin f32-candidate RHEL-Cloud
+$KOJI add-pkg --owner kojiadmin f33-candidate Fedora-Cloud
+$KOJI add-pkg --owner kojiadmin f33-candidate RHEL-Cloud
 
-$KOJI add-pkg --owner kojiadmin f32-candidate Fedora-IoT
+$KOJI add-pkg --owner kojiadmin f33-candidate Fedora-IoT
 
-$KOJI regen-repo f32-build
+$KOJI regen-repo f33-build
diff --git a/test/unit/test_builder.py b/test/unit/test_builder.py
index 6eb8439..9a71950 100644
--- a/test/unit/test_builder.py
+++ b/test/unit/test_builder.py
@@ -642,9 +642,9 @@ class TestBuilderPlugin(PluginTest):
             "plugins/builder/osbuild.py",
             "compose",
             "Fedora-Cloud-Image",
-            "32",
+            "33",
             "20201015.0",
-            "fedora-32",
+            "fedora-33",
             "http://download.localhost/pub/linux/$arch",
             "x86_64",
             "--cert", ", ".join(certs),