Date: Sat, 2 Apr 2022 12:10:49 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Justin Pryzby <pryzby@telsasoft.com>
Cc: Noah Misch <noah@leadboat.com>, Tom Lane <tgl@sss.pgh.pa.us>,
	Andres Freund <andres@anarazel.de>,
	Thomas Munro <thomas.munro@gmail.com>,
	Julien Rouhaud <rjuju123@gmail.com>,
	Andrew Dunstan <andrew@dunslane.net>,
	pgsql-hackers@lists.postgresql.org
Subject: Re: Rewriting the test of pg_upgrade as a TAP test - take three -
 remastered set
Message-ID: <Yke+udObixJVpDDx@paquier.xyz>
References: <502623.1648702814@sss.pgh.pa.us>
 <20220331053616.u446wsr732quuzer@alap3.anarazel.de>
 <YkVetIPIk1ScfC9Q@paquier.xyz>
 <547429.1648734590@sss.pgh.pa.us>
 <YkZSgJ8tGy2tAWwf@paquier.xyz>
 <20220401034241.GA3682158@rfd.leadboat.com>
 <20220401035159.GT28503@telsasoft.com>
 <YkaVQo44WFTAF2/V@paquier.xyz>
 <YkbnpriYEAagZ2wH@paquier.xyz>
 <20220401133434.GX28503@telsasoft.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="mUefxMZ2Xu2cMN32"
Content-Disposition: inline
In-Reply-To: <20220401133434.GX28503@telsasoft.com>
Archived-At: 
 <https://www.postgresql.org/message-id/Yke%2BudObixJVpDDx%40paquier.xyz>
Precedence: bulk


--mUefxMZ2Xu2cMN32
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Fri, Apr 01, 2022 at 08:34:34AM -0500, Justin Pryzby wrote:
> If you do that, should also remove upgradecheck from .cirrus.yaml, which
> currently runs the upgradecheck target.

Indeed.  It makes no sense to keep that.  I have removed this part and
applied the patch, after one extra run through the CI.

> An alternative to your patch to have the buildfarm client avoid calling
> upgradecheck if tap tests are disabled.  Under your patch, upgrade check is a
> NOP, so it should stop calling upgradecheck anyway.  So maybe this is a better
> option ?

Yeah, there is an extra issue with the buildfarm client here.  The
animals that have TAP enabled are now running the tests of pg_upgrade
twice: once per the optional module TestUpgrade and once in
run_bin_tests()@run_build.pl.  This is something that needs to be
changed in the client code itself, and maybe the best fix is to
disable TestUpgrade.pm when running with v15~ or a newer version.  A
fix with this approach would become much easier once REL_15_STABLE is
created, though.  I am pretty sure that it should also be possible to
change the list of optional modules depending on the branch running,
but I have not dug into that..
--
Michael

--mUefxMZ2Xu2cMN32
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmJHvrkACgkQnvQgOdby
QH2N6g//cu1Swc96j9uI+BP1e63X8GIJlknepyTJ1B95PtSdJoRhIxaQ4ccHxsm/
Ho4ocHKof4Eh20KhSzvHXg1gvg917MY3INra5OtIVJbbL8gjZcaFBbNcePJC6anb
WH5rpwsh6SJlcTf7q+qeDE1nfBlvP+HGvcy7nWo6ma+odLwTYlUR29x+wNHHTLzI
aKAFb08IOS1vhFMc6Uw6E7dKoz3SqysZLayfq1F52AUVFCDzwa+miVoZgdP3NuGX
gXDSMb81BHqm6yP1PVpC2y/UCcyVDdSk+QRK2InwezkiYc0M0iWjf/QgwqVpQdbI
dYzRoU9TGVzEAlGWJwmynquO5743zMS+8NYhD3wjb7BzUvzLuvqMZoHjvEz+GhFl
p+57xT8jIchdy9YURrsrRNdeKSuMZILaJeDRBvnh+dq+B9b4loHEEhMjVgkomprD
uKDfL4FCYFbKgt4C59T9kq6WnRYgMHKYxDbatpXqBWi4emHVqxbqNYZZmQ1GXnYv
EjVJIGjaOlwQWZIAENlsstOvE0hexTcAIBBhxGnwySSF+hWHEJdYcqsdq7i+GhhX
D3QHZml8q/ytFezS38pVVKhKqerPtc9YysDaKwbOIS31NSqb9fkftrMLBrXMdpMv
T9L2G6/3YVqsfbf7yPWuFWgw0EhV8FPAMbzmHK2clzFPtAMewGI=
=K380
-----END PGP SIGNATURE-----

--mUefxMZ2Xu2cMN32--