debian-trixie13-support

BarkinKctp · BarkinKctp · commit 909c1de8ac86 · 2026-01-20T11:13:31.000+03:00
diff --git a/.github/workflows/build-citus-community-nightlies.yml b/.github/workflows/build-citus-community-nightlies.yml
@@ -28,6 +28,7 @@ jobs:
           - ol/7
           - debian/bullseye
           - debian/bookworm
+          - debian/trixie
           - ubuntu/bionic
           - ubuntu/focal
           - ubuntu/jammy
diff --git a/.github/workflows/citus-package-all-platforms-test.yml b/.github/workflows/citus-package-all-platforms-test.yml
@@ -29,6 +29,7 @@ jobs:
           - ol/8
           - debian/stretch
           - debian/bullseye
+          - debian/trixie
           - ubuntu/bionic
           - ubuntu/focal
     env:
diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml
@@ -54,6 +54,7 @@ jobs:
           - ol/9
           - debian/bullseye
           - debian/bookworm
+          - debian/trixie
           - ubuntu/focal
           - ubuntu/jammy
         pg: ${{ fromJson(needs.metadata.outputs.pg_versions) }}
diff --git a/packaging/citus_package b/packaging/citus_package
@@ -25,7 +25,7 @@ use constant PACKAGE_URL =>       ## no critic (ProhibitConstantPragma)
   'https://github.com/citusdata/packaging/archive';
 
 my %supported_platforms = (
-    debian => [ "buster", "stretch", "jessie", "wheezy"],
+    debian => [ "buster", "stretch", "jessie", "wheezy", "trixie" ],
     el     => [ "8",      "7",      "6" ],
     fedora => [ "28",     "27",      "26"],
     ol     => [ "8",      "7",      "6" ],
@@ -506,6 +506,8 @@ to sign packages.
 
 =over 4
 
+=item I<debian/trixie> Debian 13 "Trixie"
+
 =item I<debian/buster> Debian 10 "Buster"
 
 =item I<debian/stretch> Debian 9 "Stretch"
diff --git a/packaging_automation/citus_package.py b/packaging_automation/citus_package.py
@@ -55,6 +55,7 @@
     "debian,bookworm": "debian/bookworm",
     "debian,bullseye": "debian/bullseye",
     "debian,stretch": "debian/stretch",
+    "debian,trixie": "debian/trixie",
     "oraclelinux,8": "ol/8",
     "oraclelinux,7": "ol/7",
     "oraclelinux,6": "ol/6",
diff --git a/packaging_automation/common_tool_methods.py b/packaging_automation/common_tool_methods.py
@@ -37,7 +37,7 @@
 referenced_repos: List[Repo] = []
 
 supported_platforms = {
-    "debian": ["bookworm", "bullseye", "buster", "stretch", "jessie", "wheezy"],
+    "debian": ["bookworm", "bullseye", "buster", "stretch", "jessie", "wheezy", "trixie"],
     "almalinux": ["8", "9"],
     "el": ["9", "8", "7", "6"],
     "ol": ["9", "8", "7"],
diff --git a/packaging_automation/publish-into-ms-packages.py b/packaging_automation/publish-into-ms-packages.py
@@ -12,6 +12,7 @@
     "debian/buster": "debian-buster",
     "debian/jessie": "debian-jessie",
     "debian/stretch": "debian-stretch",
+    "debian/trixie": "debian-trixie",
     "ubuntu/bionic": "ubuntu-bionic",
     "ubuntu/focal": "ubuntu-focal",
 }
diff --git a/packaging_automation/test_citus_package.py b/packaging_automation/test_citus_package.py
@@ -37,14 +37,9 @@ class TestPlatform(Enum):
     ol_9 = {"name": "ol/9", "docker_image_name": "ol-9"}
     debian_stretch = {"name": "debian/stretch", "docker_image_name": "debian-stretch"}
     debian_buster = {"name": "debian/buster", "docker_image_name": "debian-buster"}
-    debian_bullseye = {
-        "name": "debian/bullseye",
-        "docker_image_name": "debian-bullseye",
-    }
-    debian_bookworm = {
-        "name": "debian/bookworm",
-        "docker_image_name": "debian-bookworm",
-    }
+    debian_bullseye = {"name": "debian/bullseye","docker_image_name": "debian-bullseye",}
+    debian_bookworm = {"name": "debian/bookworm","docker_image_name": "debian-bookworm",}
+    debian_trixie = {"name": "debian/trixie", "docker_image_name": "debian-trixie"}
     ubuntu_bionic = {"name": "ubuntu/bionic", "docker_image_name": "ubuntu-bionic"}
     ubuntu_focal = {"name": "ubuntu/focal", "docker_image_name": "ubuntu-focal"}
     ubuntu_jammy = {"name": "ubuntu/jammy", "docker_image_name": "ubuntu-jammy"}
diff --git a/packaging_automation/tests/test_citus_package.py b/packaging_automation/tests/test_citus_package.py
@@ -50,6 +50,7 @@
     "debian/stretch": 2,
     "debian/bullseye": 2,
     "debian/bookworm": 2,
+    "debian/trixie": 2,
     "ubuntu/bionic": 2,
     "ubuntu/focal": 2,
     "ubuntu/jammy": 2,
diff --git a/packaging_automation/upload_to_package_cloud.py b/packaging_automation/upload_to_package_cloud.py
@@ -20,6 +20,7 @@
     "debian/buster": 150,
     "debian/bullseye": 207,
     "debian/bookworm": 215,
+    #"debian/trixie": ???,
     "ubuntu/bionic": 190,
     "ubuntu/focal": 210,
     "ubuntu/jammy": 237,
diff --git a/test-images/debian-trixie/Dockerfile b/test-images/debian-trixie/Dockerfile
@@ -0,0 +1,78 @@
+FROM debian:trixie
+ARG CITUS_VERSION
+# FOrmat should be XY and should not include dots e.g for 10.2.1=>102
+ARG CITUS_MAJOR_VERSION
+ARG PG_MAJOR
+ARG FANCY=1
+ARG HLL_VERSION=2.18.citus-1
+ARG TOPN_VERSION=2.6.0.citus-1
+
+ENV CITUS_VERSION ${CITUS_VERSION}
+
+ENV PG_MAJOR ${PG_MAJOR}
+
+ENV TZ=Europe/Istanbul
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+# install prequisities
+RUN apt-get update \
+    && apt-get install -y   lsb-release \
+                            apt-utils \
+                            vim \
+                            wget \
+                            curl \
+                            gnupg2 \
+                            software-properties-common \
+                            libcurl4-openssl-dev \
+                            libssl-dev
+
+
+# install Citus
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       ca-certificates \
+       curl \
+    && curl -s https://install.citusdata.com/community/deb.sh | bash
+RUN apt-get install -y postgresql-${PG_MAJOR}-citus-${CITUS_MAJOR_VERSION}=${CITUS_VERSION}.citus-${FANCY} \
+                       postgresql-$PG_MAJOR-hll=${HLL_VERSION} \
+                       postgresql-$PG_MAJOR-topn=${TOPN_VERSION} \
+    && apt-get purge -y --auto-remove curl \
+    && rm -rf /var/lib/apt/lists/*12
+
+
+
+ARG POSTGRES_HOME=/var/lib/postgresql/
+ENV PATH=${PATH}:/usr/lib/postgresql/${PG_MAJOR}/bin:${POSTGRES_HOME}
+
+WORKDIR ${POSTGRES_HOME}
+
+RUN mkdir citus && chown postgres citus
+
+USER postgres
+RUN cd ~ && initdb -D citus && echo "shared_preload_libraries = 'citus'" >> citus/postgresql.conf
+
+USER root
+# Install python 3.8 and its dependencies
+RUN apt-get install -y  build-essential \
+                    libcurl4-openssl-dev \
+                    libssl-dev \
+                    zlib1g-dev  \
+                    curl \
+                    libffi-dev \
+                    gnupg2 && \
+      curl  https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tgz --output Python-3.8.12.tgz &&\
+      tar xvf Python-3.8.12.tgz &&\
+      cd Python-3.8.*/ && \
+      ./configure --enable-optimizations && \
+       make altinstall && \
+       python3.8 -m pip install pip-tools
+
+COPY scripts/* ./
+
+RUN pip-compile && python3.8 -m pip install -r requirements.txt
+
+USER postgres
+
+WORKDIR ${POSTGRES_HOME}
+
+CMD ["test_internal.sh"]

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`"debian/buster": "debian-buster",`
`13`	`13`	`"debian/jessie": "debian-jessie",`
`14`	`14`	`"debian/stretch": "debian-stretch",`
	`15`	`+ "debian/trixie": "debian-trixie",`
`15`	`16`	`"ubuntu/bionic": "ubuntu-bionic",`
`16`	`17`	`"ubuntu/focal": "ubuntu-focal",`
`17`	`18`	`}`