Merge pull request #1718 from SUSE/pg17

Add PostgreSQL 17 to TW
SUSE · Sep 25, 2024 · 38067bc · 38067bc
2 parents 9c1ba07 + 464b4a3
commit 38067bc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/bci_build/package/postgres.py b/src/bci_build/package/postgres.py
@@ -16,7 +16,7 @@
 _POSTGRES_LICENSE = (Path(__file__).parent / "postgres" / "LICENSE").read_bytes()
 
 # first list the SLE15 versions, then the TW specific versions
-_POSTGRES_MAJOR_VERSIONS = [16, 15, 14] + [13, 12]
+_POSTGRES_MAJOR_VERSIONS = [16, 15, 14] + [17, 13, 12]
 POSTGRES_CONTAINERS = [
     ApplicationStackContainer(
         name="postgres",
@@ -25,7 +25,7 @@
         is_latest=ver == _POSTGRES_MAJOR_VERSIONS[0],
         pretty_name=f"PostgreSQL {ver}",
         support_level=SupportLevel.ACC,
-        package_list=[f"postgresql{ver}-server", "findutils"],
+        package_list=["libpq5", f"postgresql{ver}-server", "findutils"],
         version="%%pg_patch_version%%",
         tag_version=ver,
         additional_versions=["%%pg_minor_version%%", "%%pg_patch_version%%"],
@@ -53,6 +53,7 @@
             Replacement(
                 regex_in_build_description="%%pg_patch_version%%",
                 package_name=f"postgresql{ver}-server",
+                parse_version=ParseVersion.PATCH,
             ),
         ],
         volumes=["$PGDATA"],
@@ -77,5 +78,5 @@
             for variant in (OsVersion.SP6, OsVersion.SP7, OsVersion.TUMBLEWEED)
         ]
     )
-    + [(pg_ver, OsVersion.TUMBLEWEED) for pg_ver in (14, 13, 12)]
+    + [(pg_ver, OsVersion.TUMBLEWEED) for pg_ver in (17, 14, 13, 12)]
 ]
diff --git a/src/staging/project_setup.py b/src/staging/project_setup.py
@@ -160,7 +160,6 @@ def generate_meta(
     else:
         assert os_version.is_tumbleweed
         repository_paths = (
-            ("openSUSE:Registry", "standard"),
             ("openSUSE:Factory", "images"),
             ("openSUSE:Factory:ARM", "images"),
             ("openSUSE:Factory:ARM", "standard"),

diff --git a/tests/test_project_setup.py b/tests/test_project_setup.py
@@ -302,7 +302,6 @@
     <enable/>
   </debuginfo>
   <repository name="standard">
-    <path project="openSUSE:Registry" repository="standard"/>
     <path project="openSUSE:Factory" repository="images"/>
     <path project="openSUSE:Factory:ARM" repository="images"/>
     <path project="openSUSE:Factory:ARM" repository="standard"/>