Skip to content

Commit cf2040a

Browse files
committed
Don't run upgrade tests without pg15 binaries
1 parent b73204f commit cf2040a

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

tools/testbin

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,14 @@ skip_from_version() {
9696
[ $FROM_VERSION = 1.10.0-dev ] && return
9797
}
9898

99+
# Requires:
100+
# - FROM_VERSION
101+
# - PG_VERSION
102+
skip_from_version_pg_version() {
103+
# skip versions without PG15 binaries
104+
(( PG_VERSION >= 15 )) && (( `cmp_version $FROM_VERSION` <= 011300 )) && return
105+
}
106+
99107
# Requires:
100108
# - FROM_VERSION
101109
deb_start_test() {
@@ -118,6 +126,7 @@ test_deb() {
118126
for FROM_VERSION; do
119127
deb_start_test || continue
120128
for PG_VERSION in $PG_VERSIONS; do
129+
skip_from_version_pg_version && continue
121130
select_pg $PG_VERSION
122131
deb=timescaledb-toolkit-postgresql-${PG_VERSION}_${TOOLKIT_VERSION}~${OS_NAME}${OS_VERSION}_${ARCH}.deb
123132
$nop sudo dpkg -i "$BINDIR/$deb"
@@ -139,6 +148,7 @@ test_ci() {
139148
for FROM_VERSION; do
140149
deb_start_test || continue
141150
for PG_VERSION in $PG_VERSIONS; do
151+
skip_from_version_pg_version && continue
142152
select_pg $PG_VERSION
143153
$nop sudo dpkg -P timescaledb-toolkit-postgresql-$PG_VERSION
144154
# Installing (and possibly uninstalling) toolkit binary gives this back to root but we need to write to it.
@@ -155,6 +165,7 @@ test_rpm() {
155165
for FROM_VERSION; do
156166
skip_from_version && continue
157167
for PG_VERSION in $PG_VERSIONS; do
168+
skip_from_version_pg_version && continue
158169
select_pg $PG_VERSION
159170
rpm=timescaledb-toolkit-postgresql-$PG_VERSION
160171
# yum doesn't seem to allow force-install of a specific version.
@@ -167,6 +178,7 @@ test_rpm() {
167178
start_test
168179
done
169180
for PG_VERSION in $PG_VERSIONS; do
181+
skip_from_version_pg_version && continue
170182
select_pg $PG_VERSION
171183
rpm=timescaledb-toolkit-postgresql-$PG_VERSION-$TOOLKIT_VERSION-0.el$OS_VERSION.$ARCH.rpm
172184
$nop sudo rpm -U "$BINDIR/$rpm"

0 commit comments

Comments
 (0)