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
7 changes: 5 additions & 2 deletions circleci/images/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ PG_UPGRADE_TESTER_VERSION=$(shell echo ${PG_VERSIONS}|tr ' ' '-'|sed 's/~//g')

STYLE_CHECKER_TOOLS_VERSION=0.8.33

# Upgrade tests for the PG major versions from PG_VERSIONS file
CITUS_UPGRADE_PG_VERSIONS=$(shell head PG_VERSIONS|cut -c 6-|tr '\n' ' ')
# Upgrade tests for the PG major versions from PG_VERSIONS file.
# PG19 is excluded because no Citus release supports it yet; filter it
# out by name so reordering PG_VERSIONS does not silently change which
# major is dropped.
CITUS_UPGRADE_PG_VERSIONS=$(shell grep -v '^PG19=' PG_VERSIONS|cut -c 6-|tr '\n' ' ')
# Latest minor version of Citus 12
CITUS_UPGRADE_VERSIONS_16=v12.1.14
# Latest minor version of Citus 13
Expand Down
1 change: 1 addition & 0 deletions circleci/images/PG_VERSIONS
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
PG16=16.14
PG17=17.10
PG18=18.4
PG19=19~beta2
3 changes: 2 additions & 1 deletion circleci/images/extbuilder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ set -eux

# install key and repositories
curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
# The "19" component carries the PG19 beta packages, which are not in "main" yet.
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main 19" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bookworm-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list

apt-get update
Expand Down
18 changes: 15 additions & 3 deletions circleci/images/exttester/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ RUN locale-gen
ARG PG_VERSION
ARG PG_MAJOR
ARG CITUS_VERSION
ARG WAL2JSON_REVISION=79d516e60463be3093ff927ba72cf6354bde09af
ENV PG_VERSION=$PG_VERSION
ENV PG_MAJOR=$PG_MAJOR
ENV CITUS_VERSION=$CITUS_VERSION
Expand All @@ -153,7 +154,8 @@ set -eux

# install key and repositories
curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
# The "19" component carries the PG19 beta packages, which are not in "main" yet.
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main 19" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bookworm-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list

apt-get update
Expand All @@ -168,8 +170,18 @@ apt-get install -y --no-install-recommends --allow-downgrades \
postgresql-${PG_MAJOR}=${pgdg_version} \
postgresql-client-${PG_MAJOR}=${pgdg_version} \
postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \
postgresql-server-dev-${PG_MAJOR}=${pgdg_version} \
postgresql-${PG_MAJOR}-wal2json
postgresql-server-dev-${PG_MAJOR}=${pgdg_version}

if [ "${PG_MAJOR}" = "19" ]; then
curl -fsSL "https://github.com/eulerto/wal2json/archive/${WAL2JSON_REVISION}.tar.gz" | tar xz -C /tmp
make -C "/tmp/wal2json-${WAL2JSON_REVISION}" \
PG_CONFIG="/usr/lib/postgresql/${PG_MAJOR}/bin/pg_config" -j"$(nproc)"
make -C "/tmp/wal2json-${WAL2JSON_REVISION}" \
PG_CONFIG="/usr/lib/postgresql/${PG_MAJOR}/bin/pg_config" install
rm -rf "/tmp/wal2json-${WAL2JSON_REVISION}"
else
apt-get install -y --no-install-recommends postgresql-${PG_MAJOR}-wal2json
fi

apt-get install -y --no-install-recommends -t bookworm libdbd-pg-perl

Expand Down
3 changes: 2 additions & 1 deletion circleci/images/failtester/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ RUN <<'EOF'

# install key and repositories
curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
# The "19" component carries the PG19 beta packages, which are not in "main" yet.
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main 19" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bookworm-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list

apt-get update
Expand Down
3 changes: 2 additions & 1 deletion circleci/images/pgupgradetester/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ set -eux

# install key and repositories
curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
# The "19" component carries the PG19 beta packages, which are not in "main" yet.
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main 19" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bookworm-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list

apt-get update
Expand Down