remove pg14 and 15 from docker flow. update some tests

Author: ihalatci

docker

@@ -0,0 +1 @@
+Subproject commit 0ec73165f525a639830bb47c9cdbfa51c1c9a153

packaging_automation/publish_docker.py

@@ -28,11 +28,9 @@ class DockerImageType(Enum):
     latest = 1
     alpine = 2
     nightly = 3
-    postgres_14 = 4
-    postgres_15 = 5
-    postgres_16 = 6
-    postgres_17 = 7
-    postgres_18 = 8
+    postgres_16 = 4
+    postgres_17 = 5
+    postgres_18 = 6
 
 
 class ManualTriggerType(Enum):
@@ -58,16 +56,6 @@ class ScheduleType(Enum):
         "docker-tag": "alpine",
         "schedule-type": ScheduleType.regular,
     },
-    DockerImageType.postgres_14: {
-        "file-name": "postgres-14/Dockerfile",
-        "docker-tag": "pg14",
-        "schedule-type": ScheduleType.regular,
-    },
-    DockerImageType.postgres_15: {
-        "file-name": "postgres-15/Dockerfile",
-        "docker-tag": "pg15",
-        "schedule-type": ScheduleType.regular,
-    },
     DockerImageType.postgres_16: {
         "file-name": "postgres-16/Dockerfile",
         "docker-tag": "pg16",

packaging_automation/templates/docker/postgres-14/postgres-14.tmpl.dockerfile

@@ -16,10 +16,10 @@
     publish_nightly_docker_image,
 )
 
-NON_DEFAULT_BRANCH_NAME = "12.0.0_test"
+NON_DEFAULT_BRANCH_NAME = "13.2.0_test"
 DEFAULT_BRANCH_NAME = "master"
-TAG_NAME = "v12.0.0"
-INVALID_TAG_NAME = "v12.x"
+TAG_NAME = "v13.2.0"
+INVALID_TAG_NAME = "v13.x"
 DOCKER_IMAGE_NAME = "citusdata/citus"
 docker_client = docker.from_env()
 
@@ -49,8 +49,8 @@ def test_decode_tag_parts():
     tag_parts = decode_tag_parts(TAG_NAME)
     assert (
         len(tag_parts) == 3
-        and tag_parts[0] == "12"
-        and tag_parts[1] == "0"
+        and tag_parts[0] == "13"
+        and tag_parts[1] == "2"
         and tag_parts[2] == "0"
     )
 
@@ -60,12 +60,12 @@ def test_decode_tag_parts():
 
 def test_get_image_tag():
     image_name = get_image_tag(remove_prefix(TAG_NAME, "v"), DockerImageType.latest)
-    assert image_name == "12.0.0"
+    assert image_name == "13.2.0"
 
     image_name = get_image_tag(
-        remove_prefix(TAG_NAME, "v"), DockerImageType.postgres_15
+        remove_prefix(TAG_NAME, "v"), DockerImageType.postgres_16
     )
-    assert image_name == "12.0.0-pg15"
+    assert image_name == "13.2.0-pg16"
 
 
 def test_publish_main_docker_images():
@@ -86,10 +86,10 @@ def test_publish_tagged_docker_images_latest():
     os.chdir("docker")
     try:
         run_with_output("git checkout -b docker-unit-test")
-        publish_tagged_docker_images(DockerImageType.latest, "v12.0.0", False)
-        docker_client.images.get("citusdata/citus:12")
-        docker_client.images.get("citusdata/citus:12.0")
-        docker_client.images.get("citusdata/citus:12.0.0")
+        publish_tagged_docker_images(DockerImageType.postgres_17, "v13.2.0", False)
+        docker_client.images.get("citusdata/citus:13-pg17")
+        docker_client.images.get("citusdata/citus:13.2-pg17")
+        docker_client.images.get("citusdata/citus:13.2.0-pg17")
     finally:
         run_with_output("git checkout master")
         run_with_output("git branch -D docker-unit-test")
@@ -101,9 +101,9 @@ def test_publish_tagged_docker_images_alpine():
     try:
         run_with_output("git checkout -b docker-unit-test")
         publish_tagged_docker_images(DockerImageType.alpine, TAG_NAME, False)
-        docker_client.images.get("citusdata/citus:12-alpine")
-        docker_client.images.get("citusdata/citus:12.0-alpine")
-        docker_client.images.get("citusdata/citus:12.0.0-alpine")
+        docker_client.images.get("citusdata/citus:13-alpine")
+        docker_client.images.get("citusdata/citus:13.2-alpine")
+        docker_client.images.get("citusdata/citus:13.2.0-alpine")
     finally:
         run_with_output("git checkout master")
         run_with_output("git branch -D docker-unit-test")

packaging_automation/templates/docker/postgres-15/postgres-15.tmpl.dockerfile

@@ -9,22 +9,20 @@
     DEFAULT_ENCODING_FOR_FILE_HANDLING,
     DEFAULT_UNICODE_ERROR_HANDLER,
 )
-from dotenv import dotenv_values
 from ..update_docker import (
     update_docker_file_for_latest_postgres,
     update_regular_docker_compose_file,
     update_docker_file_alpine,
-    update_docker_file_for_postgres15,
-    update_docker_file_for_postgres14,
+    update_docker_file_for_postgres16,
     update_changelog,
 )
+from dotenv import dotenv_values
 
 BASE_PATH = os.getenv("BASE_PATH", default=pathlib2.Path(__file__).parents[2])
 TEST_BASE_PATH = f"{BASE_PATH}/docker"
 PROJECT_VERSION = "12.0.0"
 
-POSTGRES_15_VERSION = "15.4"
-POSTGRES_14_VERSION = "14.9"
+POSTGRES_16_VERSION = "16.4"
 
 PROJECT_NAME = "citus"
 version_details = get_version_details(PROJECT_VERSION)
@@ -45,7 +43,7 @@ def teardown_module():
 
 def test_update_docker_file_for_latest_postgres():
     update_docker_file_for_latest_postgres(
-        PROJECT_VERSION, TEMPLATE_PATH, TEST_BASE_PATH, POSTGRES_14_VERSION
+        PROJECT_VERSION, TEMPLATE_PATH, TEST_BASE_PATH, POSTGRES_16_VERSION
     )
     with open(
         f"{TEST_BASE_PATH}/Dockerfile",
@@ -55,7 +53,7 @@ def test_update_docker_file_for_latest_postgres():
     ) as reader:
         content = reader.read()
         lines = content.splitlines()
-        assert lines[2].strip() == f"FROM postgres:{POSTGRES_14_VERSION}"
+        assert lines[2].strip() == f"FROM postgres:{POSTGRES_16_VERSION}"
         assert lines[3].strip() == f"ARG VERSION={PROJECT_VERSION}"
         assert (
             f"postgresql-$PG_MAJOR-{PROJECT_NAME}-"
@@ -83,7 +81,7 @@ def test_update_regular_docker_compose_file():
 
 def test_update_docker_file_alpine():
     update_docker_file_alpine(
-        PROJECT_VERSION, TEMPLATE_PATH, TEST_BASE_PATH, POSTGRES_14_VERSION
+        PROJECT_VERSION, TEMPLATE_PATH, TEST_BASE_PATH, POSTGRES_16_VERSION
     )
     with open(
         f"{TEST_BASE_PATH}/alpine/Dockerfile",
@@ -93,46 +91,24 @@ def test_update_docker_file_alpine():
     ) as reader:
         content = reader.read()
         lines = content.splitlines()
-        assert lines[2].strip() == f"FROM postgres:{POSTGRES_14_VERSION}-alpine"
+        assert lines[2].strip() == f"FROM postgres:{POSTGRES_16_VERSION}-alpine"
         assert lines[3].strip() == f"ARG VERSION={PROJECT_VERSION}"
         assert len(lines) == 58
 
 
-def test_update_docker_file_for_postgres14():
-    update_docker_file_for_postgres14(
-        PROJECT_VERSION, TEMPLATE_PATH, TEST_BASE_PATH, POSTGRES_14_VERSION
-    )
-    with open(
-        f"{TEST_BASE_PATH}/postgres-14/Dockerfile",
-        "r",
-        encoding=DEFAULT_ENCODING_FOR_FILE_HANDLING,
-        errors=DEFAULT_UNICODE_ERROR_HANDLER,
-    ) as reader:
-        content = reader.read()
-        lines = content.splitlines()
-        assert lines[2].strip() == f"FROM postgres:{POSTGRES_14_VERSION}"
-        assert lines[3].strip() == f"ARG VERSION={PROJECT_VERSION}"
-        assert (
-            f"postgresql-$PG_MAJOR-{PROJECT_NAME}-"
-            f"{version_details['major']}.{version_details['minor']}=$CITUS_VERSION"
-            in lines[21]
-        )
-        assert len(lines) == 42
-
-
-def test_update_docker_file_for_postgres15():
-    update_docker_file_for_postgres15(
-        PROJECT_VERSION, TEMPLATE_PATH, TEST_BASE_PATH, POSTGRES_15_VERSION
+def test_update_docker_file_for_postgres16():
+    update_docker_file_for_postgres16(
+        PROJECT_VERSION, TEMPLATE_PATH, TEST_BASE_PATH, POSTGRES_16_VERSION
     )
     with open(
-        f"{TEST_BASE_PATH}/postgres-15/Dockerfile",
+        f"{TEST_BASE_PATH}/postgres-16/Dockerfile",
         "r",
         encoding=DEFAULT_ENCODING_FOR_FILE_HANDLING,
         errors=DEFAULT_UNICODE_ERROR_HANDLER,
     ) as reader:
         content = reader.read()
         lines = content.splitlines()
-        assert lines[2].strip() == f"FROM postgres:{POSTGRES_15_VERSION}"
+        assert lines[2].strip() == f"FROM postgres:{POSTGRES_16_VERSION}"
         assert lines[3].strip() == f"ARG VERSION={PROJECT_VERSION}"
         assert (
             f"postgresql-$PG_MAJOR-{PROJECT_NAME}-"
@@ -177,5 +153,4 @@ def test_update_changelog_without_postgres():
 
 def test_pkgvar_postgres_version_existence():
     config = dotenv_values(PKGVARS_FILE)
-    assert config["postgres_15_version"]
-    assert config["postgres_14_version"]
+    assert config["postgres_16_version"]