Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add timescaledb version 2.13.0 to PG16 #951

Merged
merged 4 commits into from
Dec 8, 2023
Merged

add timescaledb version 2.13.0 to PG16 #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
850ad82
add timescaledb version 2.13.0 to PG16
jopadi Nov 28, 2023
64d8ae5
remove old timescale and add the pg16 to spilo_commons
jopadi Dec 4, 2023
769f6d1
adjust timescale
jopadi Dec 4, 2023
8479349
comment tests to skip the timescale for pg16
jopadi Dec 8, 2023
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
2 changes: 1 addition & 1 deletion postgres-appliance/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG BASE_IMAGE=ubuntu:22.04
ARG PGVERSION=16
ARG TIMESCALEDB="2.3.1 2.11.2 2.12.2"
ARG TIMESCALEDB="2.3.1 2.11.2 2.13.0"
ARG DEMO=false
ARG COMPRESS=false
ARG ADDITIONAL_LOCALES=
Expand Down
26 changes: 12 additions & 14 deletions postgres-appliance/build_scripts/base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,20 +121,18 @@ for version in $DEB_PG_SUPPORTED_VERSIONS; do
# use subshell to avoid having to cd back (SC2103)
(
cd timescaledb
if [ "$version" != "16" ]; then
for v in $TIMESCALEDB; do
git checkout "$v"
sed -i "s/VERSION 3.11/VERSION 3.10/" CMakeLists.txt
if BUILD_FORCE_REMOVE=true ./bootstrap -DREGRESS_CHECKS=OFF -DWARNINGS_AS_ERRORS=OFF \
-DTAP_CHECKS=OFF -DPG_CONFIG="/usr/lib/postgresql/$version/bin/pg_config" \
-DAPACHE_ONLY="$TIMESCALEDB_APACHE_ONLY" -DSEND_TELEMETRY_DEFAULT=NO; then
make -C build install
strip /usr/lib/postgresql/"$version"/lib/timescaledb*.so
fi
git reset --hard
git clean -f -d
done
fi
for v in $TIMESCALEDB; do
git checkout "$v"
sed -i "s/VERSION 3.11/VERSION 3.10/" CMakeLists.txt
if BUILD_FORCE_REMOVE=true ./bootstrap -DREGRESS_CHECKS=OFF -DWARNINGS_AS_ERRORS=OFF \
-DTAP_CHECKS=OFF -DPG_CONFIG="/usr/lib/postgresql/$version/bin/pg_config" \
-DAPACHE_ONLY="$TIMESCALEDB_APACHE_ONLY" -DSEND_TELEMETRY_DEFAULT=NO; then
make -C build install
strip /usr/lib/postgresql/"$version"/lib/timescaledb*.so
fi
git reset --hard
git clean -f -d
done
)

if [ "${TIMESCALEDB_APACHE_ONLY}" != "true" ] && [ "${TIMESCALEDB_TOOLKIT}" = "true" ]; then
Expand Down
2 changes: 1 addition & 1 deletion postgres-appliance/scripts/spilo_commons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

# (min_version, max_version, shared_preload_libraries, extwlist.extensions)
extensions = {
'timescaledb': (9.6, 15, True, True),
'timescaledb': (9.6, 16, True, True),
'pg_cron': (9.5, 16, True, False),
'pg_stat_kcache': (9.4, 16, True, False),
'pg_partman': (9.4, 15, False, True)
Expand Down
4 changes: 2 additions & 2 deletions postgres-appliance/tests/test_spilo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,11 @@ function test_spilo() {


# TEST SUITE 1
run_test test_pg_upgrade_to_16_check_failed "$container" # pg_upgrade --check complains about timescaledb
#run_test test_pg_upgrade_to_16_check_failed "$container" # pg_upgrade --check complains about timescaledb

wait_backup "$container"

drop_timescaledb "$container"
#drop_timescaledb "$container"
log_info "[TS1] Testing in-place major upgrade 15->16"
run_test test_successful_inplace_upgrade_to_16 "$container"
wait_all_streaming "$container"
Expand Down