Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build-citus-community-nightlies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- ol/7
- debian/bullseye
- debian/bookworm
- debian/trixie
- ubuntu/bionic
- ubuntu/focal
- ubuntu/jammy
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/citus-package-all-platforms-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
- ol/8
- debian/stretch
- debian/bullseye
- debian/trixie
- ubuntu/bionic
- ubuntu/focal
env:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/package-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -54,6 +54,7 @@ jobs:
- ol/9
- debian/bullseye
- debian/bookworm
- debian/trixie
- ubuntu/focal
- ubuntu/jammy
pg: ${{ fromJson(needs.metadata.outputs.pg_versions) }}
Expand All @@ -74,7 +75,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 }} \
Expand Down
4 changes: 3 additions & 1 deletion packaging/citus_package
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions packaging_automation/citus_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packaging_automation/common_tool_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
1 change: 1 addition & 0 deletions packaging_automation/publish-into-ms-packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
Expand Down
18 changes: 18 additions & 0 deletions packaging_automation/publish_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ class DockerImageType(Enum):
nightly = 3
postgres_14 = 4
postgres_15 = 5
postgres_16 = 6
postgres_17 = 7
postgres_18 = 8


class ManualTriggerType(Enum):
Expand Down Expand Up @@ -65,6 +68,21 @@ class ScheduleType(Enum):
"docker-tag": "pg15",
"schedule-type": ScheduleType.regular,
},
DockerImageType.postgres_16: {
"file-name": "postgres-16/Dockerfile",
"docker-tag": "pg16",
"schedule-type": ScheduleType.regular,
},
DockerImageType.postgres_17: {
"file-name": "postgres-17/Dockerfile",
"docker-tag": "pg17",
"schedule-type": ScheduleType.regular,
},
DockerImageType.postgres_18: {
"file-name": "postgres-18/Dockerfile",
"docker-tag": "pg18",
"schedule-type": ScheduleType.regular,
},
DockerImageType.nightly: {
"file-name": "nightly/Dockerfile",
"docker-tag": "nightly",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# This file is auto generated from it's template,
# see citusdata/tools/packaging_automation/templates/docker/postgres-16/postgres-16.tmpl.dockerfile.
FROM postgres:{{postgres_version}}
ARG VERSION={{project_version}}
LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.name="Citus" \
org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \
org.label-schema.url="https://www.citusdata.com" \
org.label-schema.vcs-url="https://github.com/citusdata/citus" \
org.label-schema.vendor="Citus Data, Inc." \
org.label-schema.version=${VERSION} \
org.label-schema.schema-version="1.0"

ENV CITUS_VERSION ${VERSION}.citus-1

# 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 \
&& apt-get install -y postgresql-$PG_MAJOR-citus-{{project_minor_version}}=$CITUS_VERSION \
postgresql-$PG_MAJOR-hll=2.18.citus-1 \
postgresql-$PG_MAJOR-topn=2.6.0.citus-1 \
&& apt-get purge -y --auto-remove curl \
&& rm -rf /var/lib/apt/lists/*

# add citus to default PostgreSQL config
RUN echo "shared_preload_libraries='citus'" >> /usr/share/postgresql/postgresql.conf.sample

# add scripts to run after initdb
COPY 001-create-citus-extension.sql /docker-entrypoint-initdb.d/

# add health check script
COPY pg_healthcheck wait-for-manager.sh /
RUN chmod +x /wait-for-manager.sh

# entry point unsets PGPASSWORD, but we need it to connect to workers
# https://github.com/docker-library/postgres/blob/33bccfcaddd0679f55ee1028c012d26cd196537d/12/docker-entrypoint.sh#L303
RUN sed "/unset PGPASSWORD/d" -i /usr/local/bin/docker-entrypoint.sh

HEALTHCHECK --interval=4s --start-period=6s CMD ./pg_healthcheck
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# This file is auto generated from it's template,
# see citusdata/tools/packaging_automation/templates/docker/postgres-17/postgres-17.tmpl.dockerfile.
FROM postgres:{{postgres_version}}
ARG VERSION={{project_version}}
LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.name="Citus" \
org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \
org.label-schema.url="https://www.citusdata.com" \
org.label-schema.vcs-url="https://github.com/citusdata/citus" \
org.label-schema.vendor="Citus Data, Inc." \
org.label-schema.version=${VERSION} \
org.label-schema.schema-version="1.0"

ENV CITUS_VERSION ${VERSION}.citus-1

# 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 \
&& apt-get install -y postgresql-$PG_MAJOR-citus-{{project_minor_version}}=$CITUS_VERSION \
postgresql-$PG_MAJOR-hll=2.18.citus-1 \
postgresql-$PG_MAJOR-topn=2.6.0.citus-1 \
&& apt-get purge -y --auto-remove curl \
&& rm -rf /var/lib/apt/lists/*

# add citus to default PostgreSQL config
RUN echo "shared_preload_libraries='citus'" >> /usr/share/postgresql/postgresql.conf.sample

# add scripts to run after initdb
COPY 001-create-citus-extension.sql /docker-entrypoint-initdb.d/

# add health check script
COPY pg_healthcheck wait-for-manager.sh /
RUN chmod +x /wait-for-manager.sh

# entry point unsets PGPASSWORD, but we need it to connect to workers
# https://github.com/docker-library/postgres/blob/33bccfcaddd0679f55ee1028c012d26cd196537d/12/docker-entrypoint.sh#L303
RUN sed "/unset PGPASSWORD/d" -i /usr/local/bin/docker-entrypoint.sh

HEALTHCHECK --interval=4s --start-period=6s CMD ./pg_healthcheck
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# This file is auto generated from it's template,
# see citusdata/tools/packaging_automation/templates/docker/postgres-18/postgres-18.tmpl.dockerfile.
FROM postgres:{{postgres_version}}
ARG VERSION={{project_version}}
LABEL maintainer="Citus Data https://citusdata.com" \
org.label-schema.name="Citus" \
org.label-schema.description="Scalable PostgreSQL for multi-tenant and real-time workloads" \
org.label-schema.url="https://www.citusdata.com" \
org.label-schema.vcs-url="https://github.com/citusdata/citus" \
org.label-schema.vendor="Citus Data, Inc." \
org.label-schema.version=${VERSION} \
org.label-schema.schema-version="1.0"

ENV CITUS_VERSION ${VERSION}.citus-1

# 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 \
&& apt-get install -y postgresql-$PG_MAJOR-citus-{{project_minor_version}}=$CITUS_VERSION \
postgresql-$PG_MAJOR-hll=2.18.citus-1 \
postgresql-$PG_MAJOR-topn=2.6.0.citus-1 \
&& apt-get purge -y --auto-remove curl \
&& rm -rf /var/lib/apt/lists/*

# add citus to default PostgreSQL config
RUN echo "shared_preload_libraries='citus'" >> /usr/share/postgresql/postgresql.conf.sample

# add scripts to run after initdb
COPY 001-create-citus-extension.sql /docker-entrypoint-initdb.d/

# add health check script
COPY pg_healthcheck wait-for-manager.sh /
RUN chmod +x /wait-for-manager.sh

# entry point unsets PGPASSWORD, but we need it to connect to workers
# https://github.com/docker-library/postgres/blob/33bccfcaddd0679f55ee1028c012d26cd196537d/12/docker-entrypoint.sh#L303
RUN sed "/unset PGPASSWORD/d" -i /usr/local/bin/docker-entrypoint.sh

HEALTHCHECK --interval=4s --start-period=6s CMD ./pg_healthcheck
11 changes: 3 additions & 8 deletions packaging_automation/test_citus_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ exclude:
nightly:
ol/7: [15]
release:
all: [15]
all: [14, 15]
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,14 @@ version_matrix:
- 11.1:
postgres_versions: [ 13, 14, 15 ]
- 12.0:
postgres_versions: [ 14, 15 ]
postgres_versions: [ 14, 15 ]
- 12.1:
postgres_versions: [ 14, 15, 16 ]
- 13.0:
postgres_versions: [ 15, 16, 17 ]
- 13.1:
postgres_versions: [ 15, 16, 17 ]
- 13.2:
postgres_versions: [ 15, 16, 17]
- 14.0:
postgres_versions: [ 16, 17, 18 ]
1 change: 1 addition & 0 deletions packaging_automation/tests/test_citus_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading
Loading