Skip to content

Commit 352470f

Browse files
committed
Don't run upgrade tests without pg15 binaries
1 parent d1880a4 commit 352470f

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

tools/testbin

Lines changed: 13 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() {
@@ -105,6 +113,7 @@ deb_start_test() {
105113

106114
[ $cmp_version -ge $MIN_DEB_EPOCH ] && EPOCH=1:
107115
for PG_VERSION in $PG_VERSIONS; do
116+
skip_from_version_pg_version && continue
108117
select_pg $PG_VERSION
109118
deb=timescaledb-toolkit-postgresql-${PG_VERSION}=${EPOCH}${FROM_VERSION}~${OS_NAME}${OS_VERSION}
110119
$nop sudo apt-get -qq install $deb || die
@@ -118,6 +127,7 @@ test_deb() {
118127
for FROM_VERSION; do
119128
deb_start_test || continue
120129
for PG_VERSION in $PG_VERSIONS; do
130+
skip_from_version_pg_version && continue
121131
select_pg $PG_VERSION
122132
deb=timescaledb-toolkit-postgresql-${PG_VERSION}_${TOOLKIT_VERSION}~${OS_NAME}${OS_VERSION}_${ARCH}.deb
123133
$nop sudo dpkg -i "$BINDIR/$deb"
@@ -139,6 +149,7 @@ test_ci() {
139149
for FROM_VERSION; do
140150
deb_start_test || continue
141151
for PG_VERSION in $PG_VERSIONS; do
152+
skip_from_version_pg_version && continue
142153
select_pg $PG_VERSION
143154
$nop sudo dpkg -P timescaledb-toolkit-postgresql-$PG_VERSION
144155
# Installing (and possibly uninstalling) toolkit binary gives this back to root but we need to write to it.
@@ -155,6 +166,7 @@ test_rpm() {
155166
for FROM_VERSION; do
156167
skip_from_version && continue
157168
for PG_VERSION in $PG_VERSIONS; do
169+
skip_from_version_pg_version && continue
158170
select_pg $PG_VERSION
159171
rpm=timescaledb-toolkit-postgresql-$PG_VERSION
160172
# yum doesn't seem to allow force-install of a specific version.
@@ -167,6 +179,7 @@ test_rpm() {
167179
start_test
168180
done
169181
for PG_VERSION in $PG_VERSIONS; do
182+
skip_from_version_pg_version && continue
170183
select_pg $PG_VERSION
171184
rpm=timescaledb-toolkit-postgresql-$PG_VERSION-$TOOLKIT_VERSION-0.el$OS_VERSION.$ARCH.rpm
172185
$nop sudo rpm -U "$BINDIR/$rpm"

0 commit comments

Comments
 (0)