diff --git a/.github/workflows/citus-package-all-platforms-test.yml b/.github/workflows/citus-package-all-platforms-test.yml index 8ce8811d..14e3cbbb 100644 --- a/.github/workflows/citus-package-all-platforms-test.yml +++ b/.github/workflows/citus-package-all-platforms-test.yml @@ -25,7 +25,6 @@ jobs: - el/8 - ol/9 - ol/8 - - debian/bullseye - debian/bookworm - debian/trixie - ubuntu/jammy diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml index 818c0d60..3b90e03a 100644 --- a/.github/workflows/package-tests.yml +++ b/.github/workflows/package-tests.yml @@ -51,7 +51,6 @@ jobs: platform: - el/9 - ol/9 - - debian/bullseye - debian/bookworm - ubuntu/jammy - ubuntu/noble diff --git a/packaging_automation/README.md b/packaging_automation/README.md index 40e29df2..64a9a899 100644 --- a/packaging_automation/README.md +++ b/packaging_automation/README.md @@ -40,6 +40,9 @@ python -m pip install -r packaging_automation/requirements.txt If all the steps above completed successfully , you are ready for script execution +Debian 11 (Bullseye) is no longer supported after Debian LTS ended on 2026-08-31. +Use Bookworm or Trixie instead. Already-published packages remain available. + # **Prepare Release ** prepare-release.py script performs the pre-packaging configurations in citus/citus-enterprise projects. @@ -244,4 +247,3 @@ Script executes docker build on given image type and publishes the docker image --exec_path "$(pwd)" --tag_name ${{ github.event.inputs.tag_name }} \ --manual_trigger_type ${{ github.event.inputs.trigger_type }} ``` - diff --git a/packaging_automation/citus_package.py b/packaging_automation/citus_package.py index d19d4407..5073a23c 100644 --- a/packaging_automation/citus_package.py +++ b/packaging_automation/citus_package.py @@ -54,7 +54,6 @@ "centos,8": "el/8", "centos,7": "el/7", "debian,bookworm": "debian/bookworm", - "debian,bullseye": "debian/bullseye", "debian,stretch": "debian/stretch", "debian,trixie": "debian/trixie", "oraclelinux,8": "ol/8", diff --git a/packaging_automation/common_tool_methods.py b/packaging_automation/common_tool_methods.py index df3a599b..98a5ec1f 100644 --- a/packaging_automation/common_tool_methods.py +++ b/packaging_automation/common_tool_methods.py @@ -39,7 +39,6 @@ supported_platforms = { "debian": [ "bookworm", - "bullseye", "buster", "stretch", "jessie", diff --git a/packaging_automation/test_citus_package.py b/packaging_automation/test_citus_package.py index df51f352..89df16a4 100644 --- a/packaging_automation/test_citus_package.py +++ b/packaging_automation/test_citus_package.py @@ -37,10 +37,6 @@ 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", diff --git a/packaging_automation/tests/test_citus_package.py b/packaging_automation/tests/test_citus_package.py index 179c7917..45c08a4a 100644 --- a/packaging_automation/tests/test_citus_package.py +++ b/packaging_automation/tests/test_citus_package.py @@ -53,7 +53,6 @@ "el/9": 1, "ol/9": 1, "debian/stretch": 2, - "debian/bullseye": 2, "debian/bookworm": 2, "debian/trixie": 2, "ubuntu/bionic": 2, @@ -237,10 +236,10 @@ def test_get_postgres_versions_el_7(): assert len(nightly_versions) == 2 and nightly_versions == ["14", "15"] -def test_get_postgres_versions_debain_bullseye(): +def test_get_postgres_versions_debian_bookworm(): release_versions, nightly_versions = get_postgres_versions( input_files_dir=f"{os.getcwd()}/packaging_automation/tests/files/get_postgres_versions_tests", - platform="debian/bullseye", + platform="debian/bookworm", ) # pg 15 is excluded for all releases with pg_exclude file assert len(release_versions) == 2 and release_versions == ["13", "14"] diff --git a/packaging_automation/upload_to_package_cloud.py b/packaging_automation/upload_to_package_cloud.py index 2119aa15..39759ca5 100644 --- a/packaging_automation/upload_to_package_cloud.py +++ b/packaging_automation/upload_to_package_cloud.py @@ -18,7 +18,6 @@ "ol/9": 244, "debian/stretch": 149, "debian/buster": 150, - "debian/bullseye": 207, "debian/bookworm": 215, "debian/trixie": 221, "ubuntu/bionic": 190, diff --git a/test-images/debian-bullseye/Dockerfile b/test-images/debian-bullseye/Dockerfile deleted file mode 100644 index 448df625..00000000 --- a/test-images/debian-bullseye/Dockerfile +++ /dev/null @@ -1,77 +0,0 @@ -FROM debian:bullseye -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.21.citus-1 -ARG TOPN_VERSION=2.7.1.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} \ - && 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"]