Upgrade to Citus 13.2

Author: naisila

.github/workflows/package-tests.yml

@@ -37,8 +37,8 @@ jobs:
           export PROJECT_VERSION="${{ github.event.inputs.project_version }}"
           echo "project_version: ${{ github.event.inputs.project_version }}"
           # To be able to test pipeline without triggering with project_version parameter using workflow_dispatch parameter,
-          # if workflow_dispatch parameter is empty, 12.0.0 parameter is set to execute pipeline.
-          [ -z ${PROJECT_VERSION} ] && export PROJECT_VERSION=12.0.0
+          # if workflow_dispatch parameter is empty, 13.2.0 parameter is set to execute pipeline.
+          [ -z ${PROJECT_VERSION} ] && export PROJECT_VERSION=13.2.0
           POSTGRES_VERSIONS=$(python -m packaging_automation.get_postgres_versions --project_version ${PROJECT_VERSION})
           echo "Postgres Version: ${POSTGRES_VERSIONS}"
           echo "::set-output name=pg_versions::${POSTGRES_VERSIONS}"
@@ -74,7 +74,7 @@ jobs:
         run: |
           export PROJECT_VERSION="${{ github.event.inputs.project_version }}"
           echo "Citus Version: ${PROJECT_VERSION} "
-          [ -z ${PROJECT_VERSION} ] && export PROJECT_VERSION=12.0.0
+          [ -z ${PROJECT_VERSION} ] && export PROJECT_VERSION=13.2.0
           python -m  packaging_automation.test_citus_package \
           --project_version "${PROJECT_VERSION}" \
           --os_release ${{ matrix.platform }} \

packaging_automation/publish_docker.py

@@ -28,8 +28,8 @@ class DockerImageType(Enum):
     latest = 1
     alpine = 2
     nightly = 3
-    postgres_14 = 4
-    postgres_15 = 5
+    postgres_15 = 4
+    postgres_16 = 5
 
 
 class ManualTriggerType(Enum):
@@ -55,16 +55,16 @@ 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",
+        "schedule-type": ScheduleType.regular,
+    },
     DockerImageType.nightly: {
         "file-name": "nightly/Dockerfile",
         "docker-tag": "nightly",

packaging_automation/tests/files/get_postgres_versions_tests/postgres-matrix.yml

@@ -20,3 +20,11 @@ version_matrix:
       postgres_versions: [ 13, 14, 15 ]
   - 12.0:
         postgres_versions: [ 14, 15 ]
+  - 12.1:
+        postgres_versions: [ 14, 15, 16 ]
+  - 13.0:
+        postgres_versions: [ 15, 16 ]
+  - 13.1:
+        postgres_versions: [ 15, 16 ]
+  - 13.2:
+        postgres_versions: [ 15, 16 ]

packaging_automation/tests/test_publish_docker.py

@@ -16,9 +16,9 @@
     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"
+TAG_NAME = "v13.2.0"
 INVALID_TAG_NAME = "v12.x"
 DOCKER_IMAGE_NAME = "citusdata/citus"
 docker_client = docker.from_env()
@@ -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.latest, "v13.2.0", False)
+        docker_client.images.get("citusdata/citus:13")
+        docker_client.images.get("citusdata/citus:13.2")
+        docker_client.images.get("citusdata/citus:13.2.0")
     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/tests/test_update_docker.py

@@ -21,10 +21,10 @@
 
 BASE_PATH = os.getenv("BASE_PATH", default=pathlib2.Path(__file__).parents[2])
 TEST_BASE_PATH = f"{BASE_PATH}/docker"
-PROJECT_VERSION = "12.0.0"
+PROJECT_VERSION = "13.2.0"
 
-POSTGRES_15_VERSION = "15.4"
-POSTGRES_14_VERSION = "14.9"
+POSTGRES_16_VERSION = "16.10"
+POSTGRES_15_VERSION = "15.14"
 
 PROJECT_NAME = "citus"
 version_details = get_version_details(PROJECT_VERSION)
@@ -45,7 +45,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_15_VERSION
     )
     with open(
         f"{TEST_BASE_PATH}/Dockerfile",
@@ -55,7 +55,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_15_VERSION}"
         assert lines[3].strip() == f"ARG VERSION={PROJECT_VERSION}"
         assert (
             f"postgresql-$PG_MAJOR-{PROJECT_NAME}-"
@@ -83,7 +83,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_15_VERSION
     )
     with open(
         f"{TEST_BASE_PATH}/alpine/Dockerfile",
@@ -93,24 +93,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_15_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
+def test_update_docker_file_for_postgres15():
+    update_docker_file_for_postgres15(
+        PROJECT_VERSION, TEMPLATE_PATH, TEST_BASE_PATH, POSTGRES_15_VERSION
     )
     with open(
-        f"{TEST_BASE_PATH}/postgres-14/Dockerfile",
+        f"{TEST_BASE_PATH}/postgres-15/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[2].strip() == f"FROM postgres:{POSTGRES_15_VERSION}"
         assert lines[3].strip() == f"ARG VERSION={PROJECT_VERSION}"
         assert (
             f"postgresql-$PG_MAJOR-{PROJECT_NAME}-"
@@ -120,19 +120,19 @@ def test_update_docker_file_for_postgres14():
         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 +177,5 @@ def test_update_changelog_without_postgres():
 
 def test_pkgvar_postgres_version_existence():
     config = dotenv_values(PKGVARS_FILE)
+    assert config["postgres_16_version"]
     assert config["postgres_15_version"]
-    assert config["postgres_14_version"]

packaging_automation/update_docker.py

@@ -29,24 +29,24 @@ class SupportedDockerImages(Enum):
     latest = 1
     docker_compose = 2
     alpine = 3
-    postgres14 = 4
-    postgres15 = 5
+    postgres15 = 4
+    postgres16 = 5
 
 
 docker_templates = {
     SupportedDockerImages.latest: "latest/latest.tmpl.dockerfile",
     SupportedDockerImages.docker_compose: "latest/docker-compose.tmpl.yml",
     SupportedDockerImages.alpine: "alpine/alpine.tmpl.dockerfile",
-    SupportedDockerImages.postgres14: "postgres-14/postgres-14.tmpl.dockerfile",
     SupportedDockerImages.postgres15: "postgres-15/postgres-15.tmpl.dockerfile",
+    SupportedDockerImages.postgres16: "postgres-16/postgres-16.tmpl.dockerfile",
 }
 
 docker_outputs = {
     SupportedDockerImages.latest: "Dockerfile",
     SupportedDockerImages.docker_compose: "docker-compose.yml",
     SupportedDockerImages.alpine: "alpine/Dockerfile",
-    SupportedDockerImages.postgres14: "postgres-14/Dockerfile",
     SupportedDockerImages.postgres15: "postgres-15/Dockerfile",
+    SupportedDockerImages.postgres16: "postgres-16/Dockerfile",
 }
 
 BASE_PATH = pathlib2.Path(__file__).parent.absolute()
@@ -116,19 +116,19 @@ def update_docker_file_for_postgres15(
     write_to_file(content, dest_file_name)
 
 
-def update_docker_file_for_postgres14(
+def update_docker_file_for_postgres15(
     project_version: str, template_path: str, exec_path: str, postgres_version: str
 ):
     minor_version = get_minor_project_version_for_docker(project_version)
     debian_project_version = project_version.replace("_", "-")
     content = process_template_file_with_minor(
         debian_project_version,
         template_path,
-        docker_templates[SupportedDockerImages.postgres14],
+        docker_templates[SupportedDockerImages.postgres15],
         minor_version,
         postgres_version,
     )
-    dest_file_name = f"{exec_path}/{docker_outputs[SupportedDockerImages.postgres14]}"
+    dest_file_name = f"{exec_path}/{docker_outputs[SupportedDockerImages.postgres15]}"
     create_directory_if_not_exists(dest_file_name)
     write_to_file(content, dest_file_name)
 
@@ -176,7 +176,6 @@ def update_all_docker_files(project_version: str, exec_path: str):
     (
         postgres_16_version,
         postgres_15_version,
-        postgres_14_version,
     ) = read_postgres_versions(pkgvars_file)
 
     latest_postgres_version = postgres_16_version
@@ -188,12 +187,12 @@ def update_all_docker_files(project_version: str, exec_path: str):
     update_docker_file_alpine(
         project_version, template_path, exec_path, latest_postgres_version
     )
-    update_docker_file_for_postgres14(
-        project_version, template_path, exec_path, postgres_14_version
-    )
     update_docker_file_for_postgres15(
         project_version, template_path, exec_path, postgres_15_version
     )
+    update_docker_file_for_postgres16(
+        project_version, template_path, exec_path, postgres_16_version
+    )
     update_changelog(project_version, exec_path)
 
 
@@ -202,7 +201,6 @@ def read_postgres_versions(pkgvars_file: str) -> Tuple[str, str, str]:
     return (
         config["postgres_16_version"],
         config["postgres_15_version"],
-        config["postgres_14_version"],
     )
 
 

toolsvars

@@ -1 +1 @@
-LATEST_STABLE_PG_VERSION="14"
+LATEST_STABLE_PG_VERSION="16"