From fca6d1e855cc2926a34d0e1c957894f375695951 Mon Sep 17 00:00:00 2001 From: Rohit Ramkumar Date: Mon, 5 Feb 2018 11:33:22 -0800 Subject: [PATCH] Patch ingress upgrade test to ignore checking certain GCP resources --- test/e2e/upgrades/ingress.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/e2e/upgrades/ingress.go b/test/e2e/upgrades/ingress.go index e1e95b3438..e243e4336f 100644 --- a/test/e2e/upgrades/ingress.go +++ b/test/e2e/upgrades/ingress.go @@ -176,6 +176,15 @@ func (t *IngressUpgradeTest) verify(f *framework.Framework, done <-chan struct{} By("comparing GCP resources post-upgrade") postUpgradeResourceStore := &GCPResourceStore{} t.populateGCPResourceStore(postUpgradeResourceStore) + + // Ignore certain fields in compute.Firewall that we know will change + // due to the upgrade/downgrade. + // TODO(rramkumar): Remove this once glbc 0.9.8 is released. + t.resourceStore.Fw.Allowed = nil + t.resourceStore.Fw.SourceRanges = nil + postUpgradeResourceStore.Fw.Allowed = nil + postUpgradeResourceStore.Fw.SourceRanges = nil + framework.ExpectNoError(compareGCPResourceStores(t.resourceStore, postUpgradeResourceStore, func(v1 reflect.Value, v2 reflect.Value) error { i1 := v1.Interface() i2 := v2.Interface()