Skip to content
Merged
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
6 changes: 4 additions & 2 deletions circleci/images/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ 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 -n2 PG_VERSIONS|cut -c 6-|tr '\n' ' ')
# Upgrade tests for the PG major versions from PG_VERSIONS file
CITUS_UPGRADE_PG_VERSIONS=$(shell head PG_VERSIONS|cut -c 6-|tr '\n' ' ')
# 12.1.10 is the latest release of Citus 12 when the test is expanded to cover Citus 12
CITUS_UPGRADE_VERSIONS_16=v12.1.10
# Latest minor version of Citus 13
CITUS_UPGRADE_VERSIONS_17=v13.2.0
# Latest minor version of Citus 14
CITUS_UPGRADE_VERSIONS_18=v14.0.0

# Function to get Citus versions for a specific PG major version
get_citus_versions = $(CITUS_UPGRADE_VERSIONS_$(1))
Expand Down
6 changes: 3 additions & 3 deletions circleci/images/PG_VERSIONS
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PG16=16.11
PG17=17.7
PG18=18.1
PG16=16.13
PG17=17.9
PG18=18.3
28 changes: 14 additions & 14 deletions circleci/images/citusupgradetester/files/etc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# generated from Citus's Pipfile.lock (in src/test/regress) as of #8442
# generated from Citus's Pipfile.lock (in src/test/regress) as of citusdata/citus#8488
# using `pipenv requirements > requirements.txt`, so as to avoid the
# need for pipenv/pyenv in this image

Expand All @@ -11,14 +11,14 @@ attrs==25.4.0; python_version >= '3.9'
bcrypt==5.0.0; python_version >= '3.8'
blinker==1.9.0; python_version >= '3.9'
brotli==1.2.0
certifi==2026.1.4; python_version >= '3.7'
certifi==2026.2.25; python_version >= '3.7'
cffi==2.0.0; python_version >= '3.9'
click==8.3.1; python_version >= '3.10'
construct==2.10.70; python_version >= '3.6'
cryptography==44.0.3; python_version >= '3.7' and python_full_version not in '3.9.0, 3.9.1'
cryptography==46.0.5; python_version >= '3.8' and python_full_version not in '3.9.0, 3.9.1'
docopt==0.6.2
execnet==2.1.2; python_version >= '3.8'
filelock==3.20.2; python_version >= '3.10'
filelock==3.25.0; python_version >= '3.10'
flask==3.1.2; python_version >= '3.9'
h11==0.16.0; python_version >= '3.8'
h2==4.3.0; python_version >= '3.9'
Expand All @@ -31,19 +31,19 @@ kaitaistruct==0.11; python_version >= '2.7' and python_version not in '3.0, 3.1,
ldap3==2.9.1
markupsafe==3.0.3; python_version >= '3.9'
mitmproxy @ git+https://github.com/citusdata/mitmproxy.git@30b588eb1b7c66da233d7c471ec23f2b632ed531
mitmproxy-linux==0.12.8; python_version >= '3.12'
mitmproxy-rs==0.12.8; python_version >= '3.12'
mitmproxy-linux==0.12.9; python_version >= '3.12'
mitmproxy-rs==0.12.9; python_version >= '3.12'
msgpack==1.1.2; python_version >= '3.9'
packaging==25.0; python_version >= '3.8'
packaging==26.0; python_version >= '3.8'
pluggy==1.6.0; python_version >= '3.9'
psycopg==3.3.2; python_version >= '3.10'
psycopg==3.3.3; python_version >= '3.10'
publicsuffix2==2.20191221
pyasn1==0.6.1; python_version >= '3.8'
pyasn1==0.6.2; python_version >= '3.8'
pyasn1-modules==0.4.2; python_version >= '3.8'
pycparser==2.23; python_version >= '3.8'
pycparser==3.0; python_version >= '3.10'
pygments==2.19.2; python_version >= '3.8'
pylsqpack==0.3.23; python_version >= '3.10'
pyopenssl==25.1.0; python_version >= '3.7'
pyopenssl==25.3.0; python_version >= '3.7'
pyparsing==3.2.5; python_version >= '3.9'
pyperclip==1.9.0
pytest==9.0.2; python_version >= '3.10'
Expand All @@ -59,7 +59,7 @@ sortedcontainers==2.4.0
tornado==6.5.2; python_version >= '3.9'
typing-extensions==4.14.0; python_version >= '3.9'
urwid==3.0.3; python_full_version >= '3.9.0'
wcwidth==0.2.14; python_version >= '3.6'
werkzeug==3.1.4; python_version >= '3.9'
wcwidth==0.6.0; python_version >= '3.8'
werkzeug==3.1.5; python_version >= '3.9'
wsproto==1.2.0; python_full_version >= '3.7.0'
zstandard==0.25.0; python_version >= '3.9'
zstandard==0.25.0; python_version >= '3.9'
28 changes: 14 additions & 14 deletions circleci/images/failtester/files/etc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# generated from Citus's Pipfile.lock (in src/test/regress) as of #8442
# generated from Citus's Pipfile.lock (in src/test/regress) as of citusdata/citus#8488
# using `pipenv requirements > requirements.txt`, so as to avoid the
# need for pipenv/pyenv in this image

Expand All @@ -11,14 +11,14 @@ attrs==25.4.0; python_version >= '3.9'
bcrypt==5.0.0; python_version >= '3.8'
blinker==1.9.0; python_version >= '3.9'
brotli==1.2.0
certifi==2026.1.4; python_version >= '3.7'
certifi==2026.2.25; python_version >= '3.7'
cffi==2.0.0; python_version >= '3.9'
click==8.3.1; python_version >= '3.10'
construct==2.10.70; python_version >= '3.6'
cryptography==44.0.3; python_version >= '3.7' and python_full_version not in '3.9.0, 3.9.1'
cryptography==46.0.5; python_version >= '3.8' and python_full_version not in '3.9.0, 3.9.1'
docopt==0.6.2
execnet==2.1.2; python_version >= '3.8'
filelock==3.20.2; python_version >= '3.10'
filelock==3.25.0; python_version >= '3.10'
flask==3.1.2; python_version >= '3.9'
h11==0.16.0; python_version >= '3.8'
h2==4.3.0; python_version >= '3.9'
Expand All @@ -31,19 +31,19 @@ kaitaistruct==0.11; python_version >= '2.7' and python_version not in '3.0, 3.1,
ldap3==2.9.1
markupsafe==3.0.3; python_version >= '3.9'
mitmproxy @ git+https://github.com/citusdata/mitmproxy.git@30b588eb1b7c66da233d7c471ec23f2b632ed531
mitmproxy-linux==0.12.8; python_version >= '3.12'
mitmproxy-rs==0.12.8; python_version >= '3.12'
mitmproxy-linux==0.12.9; python_version >= '3.12'
mitmproxy-rs==0.12.9; python_version >= '3.12'
msgpack==1.1.2; python_version >= '3.9'
packaging==25.0; python_version >= '3.8'
packaging==26.0; python_version >= '3.8'
pluggy==1.6.0; python_version >= '3.9'
psycopg==3.3.2; python_version >= '3.10'
psycopg==3.3.3; python_version >= '3.10'
publicsuffix2==2.20191221
pyasn1==0.6.1; python_version >= '3.8'
pyasn1==0.6.2; python_version >= '3.8'
pyasn1-modules==0.4.2; python_version >= '3.8'
pycparser==2.23; python_version >= '3.8'
pycparser==3.0; python_version >= '3.10'
pygments==2.19.2; python_version >= '3.8'
pylsqpack==0.3.23; python_version >= '3.10'
pyopenssl==25.1.0; python_version >= '3.7'
pyopenssl==25.3.0; python_version >= '3.7'
pyparsing==3.2.5; python_version >= '3.9'
pyperclip==1.9.0
pytest==9.0.2; python_version >= '3.10'
Expand All @@ -59,7 +59,7 @@ sortedcontainers==2.4.0
tornado==6.5.2; python_version >= '3.9'
typing-extensions==4.14.0; python_version >= '3.9'
urwid==3.0.3; python_full_version >= '3.9.0'
wcwidth==0.2.14; python_version >= '3.6'
werkzeug==3.1.4; python_version >= '3.9'
wcwidth==0.6.0; python_version >= '3.8'
werkzeug==3.1.5; python_version >= '3.9'
wsproto==1.2.0; python_full_version >= '3.7.0'
zstandard==0.25.0; python_version >= '3.9'
zstandard==0.25.0; python_version >= '3.9'
28 changes: 14 additions & 14 deletions circleci/images/pgupgradetester/files/etc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# generated from Citus's Pipfile.lock (in src/test/regress) as of #8442
# generated from Citus's Pipfile.lock (in src/test/regress) as of citusdata/citus#8488
# using `pipenv requirements > requirements.txt`, so as to avoid the
# need for pipenv/pyenv in this image

Expand All @@ -11,14 +11,14 @@ attrs==25.4.0; python_version >= '3.9'
bcrypt==5.0.0; python_version >= '3.8'
blinker==1.9.0; python_version >= '3.9'
brotli==1.2.0
certifi==2026.1.4; python_version >= '3.7'
certifi==2026.2.25; python_version >= '3.7'
cffi==2.0.0; python_version >= '3.9'
click==8.3.1; python_version >= '3.10'
construct==2.10.70; python_version >= '3.6'
cryptography==44.0.3; python_version >= '3.7' and python_full_version not in '3.9.0, 3.9.1'
cryptography==46.0.5; python_version >= '3.8' and python_full_version not in '3.9.0, 3.9.1'
docopt==0.6.2
execnet==2.1.2; python_version >= '3.8'
filelock==3.20.2; python_version >= '3.10'
filelock==3.25.0; python_version >= '3.10'
flask==3.1.2; python_version >= '3.9'
h11==0.16.0; python_version >= '3.8'
h2==4.3.0; python_version >= '3.9'
Expand All @@ -31,19 +31,19 @@ kaitaistruct==0.11; python_version >= '2.7' and python_version not in '3.0, 3.1,
ldap3==2.9.1
markupsafe==3.0.3; python_version >= '3.9'
mitmproxy @ git+https://github.com/citusdata/mitmproxy.git@30b588eb1b7c66da233d7c471ec23f2b632ed531
mitmproxy-linux==0.12.8; python_version >= '3.12'
mitmproxy-rs==0.12.8; python_version >= '3.12'
mitmproxy-linux==0.12.9; python_version >= '3.12'
mitmproxy-rs==0.12.9; python_version >= '3.12'
msgpack==1.1.2; python_version >= '3.9'
packaging==25.0; python_version >= '3.8'
packaging==26.0; python_version >= '3.8'
pluggy==1.6.0; python_version >= '3.9'
psycopg==3.3.2; python_version >= '3.10'
psycopg==3.3.3; python_version >= '3.10'
publicsuffix2==2.20191221
pyasn1==0.6.1; python_version >= '3.8'
pyasn1==0.6.2; python_version >= '3.8'
pyasn1-modules==0.4.2; python_version >= '3.8'
pycparser==2.23; python_version >= '3.8'
pycparser==3.0; python_version >= '3.10'
pygments==2.19.2; python_version >= '3.8'
pylsqpack==0.3.23; python_version >= '3.10'
pyopenssl==25.1.0; python_version >= '3.7'
pyopenssl==25.3.0; python_version >= '3.7'
pyparsing==3.2.5; python_version >= '3.9'
pyperclip==1.9.0
pytest==9.0.2; python_version >= '3.10'
Expand All @@ -59,7 +59,7 @@ sortedcontainers==2.4.0
tornado==6.5.2; python_version >= '3.9'
typing-extensions==4.14.0; python_version >= '3.9'
urwid==3.0.3; python_full_version >= '3.9.0'
wcwidth==0.2.14; python_version >= '3.6'
werkzeug==3.1.4; python_version >= '3.9'
wcwidth==0.6.0; python_version >= '3.8'
werkzeug==3.1.5; python_version >= '3.9'
wsproto==1.2.0; python_full_version >= '3.7.0'
zstandard==0.25.0; python_version >= '3.9'
zstandard==0.25.0; python_version >= '3.9'
4 changes: 3 additions & 1 deletion circleci/images/stylechecker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profil
. "$CARGO_HOME/env"
rustup toolchain install nightly-x86_64-unknown-linux-musl
rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-musl
cargo install --locked bpf-linker --no-default-features --features llvm-21
export PATH="/root/.cargo/bin:${PATH}"
export PATH="/usr/lib/llvm21/bin:${PATH}"

LLVM_CONFIG="$(command -v llvm-config || command -v llvm-config-21)"
LLVM_LIBDIR="$(${LLVM_CONFIG} --libdir)"
Expand All @@ -78,6 +78,8 @@ export LLVM_SYS_211_STATIC=1
export AYA_RUSTC_LLVM_PROXY_DISABLE_DLOPEN=1
export AYA_RUSTC_LLVM_PROXY_LIB_DIR="${LLVM_LIBDIR}"

cargo install --locked bpf-linker --version 0.9.15 --no-default-features --features llvm-21


install -m 755 "$CARGO_HOME/bin/bpf-linker" /usr/local/bin/bpf-linker

Expand Down
69 changes: 6 additions & 63 deletions circleci/images/stylechecker/files/etc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# generated from Citus's Pipfile.lock (in src/test/regress) as of #8442
# using `pipenv requirements --dev > requirements.txt`, so as to avoid the
# generated from Citus's Pipfile.lock (in src/test/regress) as of citusdata/citus#8488
# using `pipenv requirements --dev-only > requirements.txt`, so as to avoid the
# need for pipenv/pyenv in this image

-i https://pypi.python.org/simple
Expand All @@ -8,68 +8,11 @@ black==24.10.0; python_version >= '3.9'
click==8.3.1; python_version >= '3.10'
flake8==7.3.0; python_version >= '3.9'
flake8-bugbear==25.11.29; python_version >= '3.10'
isort==7.0.0; python_full_version >= '3.10.0'
isort==8.0.1; python_full_version >= '3.10.0'
mccabe==0.7.0; python_version >= '3.6'
mypy-extensions==1.1.0; python_version >= '3.8'
packaging==25.0; python_version >= '3.8'
pathspec==1.0.2; python_version >= '3.9'
platformdirs==4.5.1; python_version >= '3.10'
packaging==26.0; python_version >= '3.8'
pathspec==1.0.4; python_version >= '3.9'
platformdirs==4.9.2; python_version >= '3.10'
pycodestyle==2.14.0; python_version >= '3.9'
pyflakes==3.4.0; python_version >= '3.9'
aioquic==1.2.0; python_version >= '3.8'
argon2-cffi==25.1.0; python_version >= '3.8'
argon2-cffi-bindings==25.1.0; python_version >= '3.9'
asgiref==3.10.0; python_version >= '3.9'
bcrypt==5.0.0; python_version >= '3.8'
blinker==1.9.0; python_version >= '3.9'
brotli==1.2.0
certifi==2026.1.4; python_version >= '3.7'
cffi==2.0.0; python_version >= '3.9'
construct==2.10.70; python_version >= '3.6'
cryptography==44.0.3; python_version >= '3.7' and python_full_version not in '3.9.0, 3.9.1'
docopt==0.6.2
execnet==2.1.2; python_version >= '3.8'
filelock==3.20.2; python_version >= '3.10'
flask==3.1.2; python_version >= '3.9'
h11==0.16.0; python_version >= '3.8'
h2==4.3.0; python_version >= '3.9'
hpack==4.1.0; python_version >= '3.9'
hyperframe==6.1.0; python_version >= '3.9'
iniconfig==2.3.0; python_version >= '3.10'
itsdangerous==2.2.0; python_version >= '3.8'
jinja2==3.1.6; python_version >= '3.7'
kaitaistruct==0.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
ldap3==2.9.1
markupsafe==3.0.3; python_version >= '3.9'
mitmproxy @ git+https://github.com/citusdata/mitmproxy.git@30b588eb1b7c66da233d7c471ec23f2b632ed531
mitmproxy-linux==0.12.8; python_version >= '3.12'
mitmproxy-rs==0.12.8; python_version >= '3.12'
msgpack==1.1.2; python_version >= '3.9'
pluggy==1.6.0; python_version >= '3.9'
psycopg==3.3.2; python_version >= '3.10'
publicsuffix2==2.20191221
pyasn1==0.6.1; python_version >= '3.8'
pyasn1-modules==0.4.2; python_version >= '3.8'
pycparser==2.23; python_version >= '3.8'
pygments==2.19.2; python_version >= '3.8'
pylsqpack==0.3.23; python_version >= '3.10'
pyopenssl==25.1.0; python_version >= '3.7'
pyparsing==3.2.5; python_version >= '3.9'
pyperclip==1.9.0
pytest==9.0.2; python_version >= '3.10'
pytest-asyncio==1.3.0; python_version >= '3.10'
pytest-repeat==0.9.4; python_version >= '3.9'
pytest-timeout==2.4.0; python_version >= '3.7'
pytest-xdist==3.8.0; python_version >= '3.9'
pyyaml==6.0.3; python_version >= '3.8'
ruamel.yaml==0.18.16; python_version >= '3.8'
ruamel.yaml.clib==0.2.15; python_version >= '3.9'
service-identity==24.2.0; python_version >= '3.8'
sortedcontainers==2.4.0
tornado==6.5.2; python_version >= '3.9'
typing-extensions==4.14.0; python_version >= '3.9'
urwid==3.0.3; python_full_version >= '3.9.0'
wcwidth==0.2.14; python_version >= '3.6'
werkzeug==3.1.4; python_version >= '3.9'
wsproto==1.2.0; python_full_version >= '3.7.0'
zstandard==0.25.0; python_version >= '3.9'