Merge pull request #4612 from citusdata/clean-before-upgrade-tests

src/test/regress/Makefile

@@ -212,19 +212,22 @@ check-citus-upgrade-mixed:
 		--citus-post-tar=$(citus-post-tar) \
 		--mixed
 
-check-citus-upgrade-local:
+check-citus-upgrade-local: clean-upgrade-artifacts
 	$(citus_upgrade_check) \
 		--bindir=$(bindir) \
 		--pgxsdir=$(pgxsdir) \
 		--citus-old-version=$(citus-old-version)
 
-check-citus-upgrade-mixed-local:
+check-citus-upgrade-mixed-local: clean-upgrade-artifacts
 	$(citus_upgrade_check) \
 		--bindir=$(bindir) \
 		--pgxsdir=$(pgxsdir) \
 		--citus-old-version=$(citus-old-version) \
 		--mixed
 
+clean-upgrade-artifacts:
+	rm -rf $(citus_abs_srcdir)/tmp_citus_tarballs/ $(citus_abs_srcdir)/tmp_citus_upgrade/ /tmp/citus_copy/
+
 clean distclean maintainer-clean:
 	rm -f $(output_files) $(input_files)
 	rm -rf tmp_check/

src/test/regress/upgrade/generate_citus_tarballs.sh

@@ -49,10 +49,6 @@ build_ext() {
   citus_version="$1"
   basedir="${base}/${citus_version}"
 
-  if test -f "${base}/install-citus${citus_version}.tar"; then
-    return
-  fi
-
   mkdir -p "${basedir}"
   cd "${basedir}"
   citus_dir=${basedir}/citus_$citus_version