Automatic merge from submit-queue Revert "Add more test cases to k8s e2e upgrade tests" Reverts kubernetes/kubernetes#35697