Do not support upgrades on Fedora

Skip in case of previous version does not exist

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

Author: phracek

test/conftest.py

@@ -37,7 +37,7 @@
 TEST_APP = TEST_DIR / "test-app"
 VERY_LONG_IDENTIFIER = "very_long_identifier_" + "x" * 40
 MIGRATION_PATHS = ["12", "13", "15", "16", "18"]
-VERSION_DICT = {
+PREVIOUS_VERSION_DICT = {
     "13": "12",
     "15": "13",
     "16": "15",
@@ -49,12 +49,14 @@
     "select count(*) from staff;": "2",
     "select * from information_schema.tables;": "28",
 }
+RHEL9 = "none 13 15 16 18 none"
+RHEL10 = "none 16 18 none"
 UPGRADE_PATH_DICT = {
     "rhel8": "none 12 13 15 16 18 none",
-    "rhel9": "none 13 15 16 18 none",
-    "c9s": "none 13 15 16 18 none",
-    "rhel10": "none 16 18 none",
-    "c10s": "none 16 18 none",
+    "rhel9": RHEL9,
+    "c9s": RHEL9,
+    "rhel10": RHEL10,
+    "c10s": RHEL10,
     "fedora": "none 15 16 18 none",
 }
 VARS = Vars(
@@ -65,7 +67,7 @@
     TAG=OS.replace("rh", "-", 1),
     TEST_APP=TEST_APP,
     VERY_LONG_IDENTIFIER=VERY_LONG_IDENTIFIER,
-    PREVIOUS_VERSION=VERSION_DICT.get(VERSION),
+    PREVIOUS_VERSION=PREVIOUS_VERSION_DICT.get(VERSION),
     PAGILA=PAGILA,
     MIGRATION_PATHS=MIGRATION_PATHS,
     UPGRADE_PATH_DICT=UPGRADE_PATH_DICT,
@@ -90,14 +92,9 @@ def get_image_id(version):
     """
     Get the image ID of the PostgreSQL container.
     """
-    ns = {
-        "rhel8": f"registry.redhat.io/rhel8/postgresql-{version}",
-        "rhel9": f"registry.redhat.io/rhel9/postgresql-{version}",
-        "rhel10": f"registry.redhat.io/rhel10/postgresql-{version}",
-        "c9s": f"quay.io/sclorg/postgresql-{version}-c9s",
-        "c10s": f"quay.io/sclorg/postgresql-{version}-c10s",
-    }
-    return ns[VARS.OS]
+    if version.startswith("rhel"):
+        return f"registry.redhat.io/{VARS.OS}/postresql-{version}"
+    return f"quay.io/sclorg/postgresql-{version}-{VARS.OS}"
 
 
 def check_db_output(

test/test_container_upgrade.py

@@ -44,10 +44,13 @@ def test_upgrade_functionality(self, upgrade_type, datadir):
         2. Create a container with the new version and run pg_upgrade
         3. Test if the database connection works
         """
+        if VARS.OS == "fedora":
+            pytest.skip("Skip upgrade test on Fedora. Only CentOS Stream and RHELs are supported.")
         self.datadir = datadir
         self.upgrade_volume_dir = tempfile.mkdtemp(prefix=f"/tmp/psql-upgrade-{upgrade_type}-{datadir}")
         prev_version = get_upgrade_path()
-        assert prev_version, "Previous version not found"
+        if not prev_version:
+            pytest.skip(f"Skipping for {VARS.OS} and version {VARS.VERSION}. No upgrade path found.")
         assert PodmanCLIWrapper.podman_pull_image(image_name=get_image_id(prev_version))
         # Override the image name to previous version
         self.upgrade_db.image_name = get_image_id(prev_version)