Cherry-pick Bug 3697586 fix #7121

Job	Run time
get_postgres_versions_from_file	6s
rpm_build_tests (oraclelinux-8, 14)	1m 58s
deb_build_tests (debian-buster-all, 14)	1m 56s
rpm_build_tests (oraclelinux-8, 15)	2m 6s
deb_build_tests (debian-buster-all, 15)	2m 0s
rpm_build_tests (oraclelinux-8, 16)	2m 0s
deb_build_tests (debian-buster-all, 16)	1m 58s
rpm_build_tests (almalinux-8, 14)	1m 54s
deb_build_tests (debian-bookworm-all, 14)	2m 10s
rpm_build_tests (almalinux-8, 15)	1m 50s
deb_build_tests (debian-bookworm-all, 15)	2m 12s
rpm_build_tests (almalinux-8, 16)	1m 52s
deb_build_tests (debian-bookworm-all, 16)	2m 27s
rpm_build_tests (almalinux-9, 14)	1m 53s
deb_build_tests (debian-bullseye-all, 14)	2m 4s
rpm_build_tests (almalinux-9, 15)	1m 53s
deb_build_tests (debian-bullseye-all, 15)	2m 3s
rpm_build_tests (almalinux-9, 16)	1m 53s
deb_build_tests (debian-bullseye-all, 16)	2m 0s
deb_build_tests (ubuntu-focal-all, 14)	2m 0s
deb_build_tests (ubuntu-focal-all, 15)	1m 56s
deb_build_tests (ubuntu-focal-all, 16)	2m 3s
deb_build_tests (ubuntu-jammy-all, 14)	2m 11s
deb_build_tests (ubuntu-jammy-all, 15)	2m 10s
deb_build_tests (ubuntu-jammy-all, 16)	2m 45s
	49m 20s

Provide feedback