@@ -16,12 +16,14 @@ PG_UPGRADE_TESTER_VERSION=$(shell echo ${PG_VERSIONS}|tr ' ' '-'|sed 's/~//g')
1616
1717STYLE_CHECKER_TOOLS_VERSION =0.8.18
1818
19- # Upgrade tests for the previous 2 Citus major versions
20- CITUS_UPGRADE_PG_VERSIONS =$(shell head -n2 PG_VERSIONS|cut -c 6-|tr '\n' ' ')
19+ # Upgrade tests for the PG major versions from PG_VERSIONS file
20+ CITUS_UPGRADE_PG_VERSIONS =$(shell head PG_VERSIONS|cut -c 6-|tr '\n' ' ')
2121# 11.1.0 is the oldest version supporting PG15, whereas 11.3.0 is for upgrade_pg_dist_cleanup tests
2222# 12.1.10 is the latest release of Citus 12 when the test is expanded to cover Citus 12
2323CITUS_UPGRADE_VERSIONS_15 =v11.1.0 v11.3.0 v12.1.10
2424CITUS_UPGRADE_VERSIONS_16 =v12.1.10
25+ # Latest minor version of Citus 13
26+ CITUS_UPGRADE_VERSIONS_17 =v13.2.0
2527
2628# Function to get Citus versions for a specific PG major version
2729get_citus_versions = $(CITUS_UPGRADE_VERSIONS_$(1 ) )
9496# call make-image-targets($PG_VERSION, $PG_MAJOR) for every version in PG_VERSIONS
9597$(foreach element,$(PG_VERSIONS),$(eval $(call make-image-targets,$(element),$(shell echo $(element) | awk -F'[^0-9]*' '/[0-9]/ { print $$1 }'),$(shell echo $(element) | sed 's/~//'))))
9698
97- define make-citus-upgrage -targets
99+ define make-citus-upgrade -targets
98100# $1 = PG_VERSION
99101# $2 = PG_MAJOR
100102# $3 = PG_VERSION_CLEAN
@@ -117,7 +119,7 @@ push-citusupgradetester-$1: build-citusupgradetester-$1
117119push-all:: push-citusupgradetester-$1
118120push-citusupgradetester-all:: push-citusupgradetester-$1
119121endef
120- $(foreach element,$(CITUS_UPGRADE_PG_VERSIONS),$(eval $(call make-citus-upgrage -targets,$(element),$(shell echo $(element) | awk -F'[^0-9]*' '/[0-9]/ { print $$1 }'),$(shell echo $(element) | sed 's/~//'))))
122+ $(foreach element,$(CITUS_UPGRADE_PG_VERSIONS),$(eval $(call make-citus-upgrade -targets,$(element),$(shell echo $(element) | awk -F'[^0-9]*' '/[0-9]/ { print $$1 }'),$(shell echo $(element) | sed 's/~//'))))
121123
122124
123125# pg upgrade image is 1 global image
0 commit comments