From b8ad6471ff3a9744a95a6d96b22d7bde502dc19d Mon Sep 17 00:00:00 2001 From: Andrew McDermott Date: Fri, 31 Jul 2020 14:41:34 +0100 Subject: [PATCH] Bug 1861944: re-enable service upgrade This was disabled in: https://github.com/openshift/origin/pull/25314 --- test/e2e/upgrade/upgrade.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/e2e/upgrade/upgrade.go b/test/e2e/upgrade/upgrade.go index 60ddca4fc15f..217a25f50729 100644 --- a/test/e2e/upgrade/upgrade.go +++ b/test/e2e/upgrade/upgrade.go @@ -27,7 +27,7 @@ import ( configv1 "github.com/openshift/api/config/v1" configv1client "github.com/openshift/client-go/config/clientset/versioned" "github.com/openshift/origin/test/e2e/upgrade/alert" - // "github.com/openshift/origin/test/e2e/upgrade/service" + "github.com/openshift/origin/test/e2e/upgrade/service" "github.com/openshift/origin/test/extended/util/disruption" "github.com/openshift/origin/test/extended/util/disruption/controlplane" "github.com/openshift/origin/test/extended/util/disruption/frontends" @@ -39,8 +39,7 @@ func AllTests() []upgrades.Test { controlplane.NewOpenShiftAvailableTest(), &alert.UpgradeTest{}, &frontends.AvailableTest{}, - // Broken by 1.19 rebase, fix tracked by https://bugzilla.redhat.com/show_bug.cgi?id=1861944 - // &service.UpgradeTest{}, + &service.UpgradeTest{}, &upgrades.SecretUpgradeTest{}, &apps.ReplicaSetUpgradeTest{}, &apps.StatefulSetUpgradeTest{},