Merge "Update test_upgrades job"