The CLI Python import in Upgrade means only one upgrade will work.

Related to the comment in commit 34cf59cbc05d418d445c41323a0aa1098c6ac1b0
Replace the plain upgrade test with the matrix build upgrade test since this should test everything.