change upgrade test strategy

Do full upgrade tests from the head of each relevant branch, to head of
next. Do partial upgrade tests for each branch from a) latest tag to
head of same branch, and also from b) latest tag to head of "next"
branch.