diff --git a/tests-extension/.openshift-tests-extension/openshift_payload_olmv0.json b/tests-extension/.openshift-tests-extension/openshift_payload_olmv0.json index 5395fcfa1c..e03c6cff70 100644 --- a/tests-extension/.openshift-tests-extension/openshift_payload_olmv0.json +++ b/tests-extension/.openshift-tests-extension/openshift_payload_olmv0.json @@ -1473,6 +1473,7 @@ "originalName": "[sig-operator][Jira:OLM] OLMv0 on microshift PolarionID:83581-[Skipped:Disconnected]olmv0 networkpolicy on microshift.", "labels": { "Extended": {}, + "Lifecycle:informing": {}, "NonHyperShiftHOST": {}, "original-name:[sig-operator][Jira:OLM] OLMv0 on microshift PolarionID:83581-[Skipped:Disconnected]olmv0 networkpolicy on microshift.": {} }, @@ -1480,7 +1481,7 @@ "isolation": {} }, "source": "openshift:payload:olmv0", - "lifecycle": "blocking", + "lifecycle": "informing", "environmentSelector": { "exclude": "topology==\"External\"" } diff --git a/tests-extension/test/qe/specs/olmv0_microshift.go b/tests-extension/test/qe/specs/olmv0_microshift.go index ee0a7f9186..8c66064b79 100644 --- a/tests-extension/test/qe/specs/olmv0_microshift.go +++ b/tests-extension/test/qe/specs/olmv0_microshift.go @@ -7,6 +7,7 @@ import ( g "github.com/onsi/ginkgo/v2" o "github.com/onsi/gomega" + ote "github.com/openshift-eng/openshift-tests-extension/pkg/ginkgo" exutil "github.com/openshift/operator-framework-olm/tests-extension/test/qe/util" "github.com/openshift/operator-framework-olm/tests-extension/test/qe/util/olmv0util" @@ -219,7 +220,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 on microshift", g.Label("NonH }) - g.It("PolarionID:83581-[OTP][Skipped:Disconnected]olmv0 networkpolicy on microshift.", g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 on microshift PolarionID:83581-[Skipped:Disconnected]olmv0 networkpolicy on microshift."), func() { + g.It("PolarionID:83581-[OTP][Skipped:Disconnected]olmv0 networkpolicy on microshift.", ote.Informing(), g.Label("original-name:[sig-operator][Jira:OLM] OLMv0 on microshift PolarionID:83581-[Skipped:Disconnected]olmv0 networkpolicy on microshift."), func() { policies := []olmv0util.NpExpecter{ { @@ -233,14 +234,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 on microshift", g.Label("NonH }, ExpectEgress: []olmv0util.EgressRule{ { - Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, + Ports: []olmv0util.Port{{}}, Selectors: nil, }, { - Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}}, - Selectors: []olmv0util.Selector{ - {NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}}, + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, }, + Selectors: nil, }, { Ports: []olmv0util.Port{{Port: 50051, Protocol: "TCP"}}, @@ -269,14 +273,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 on microshift", g.Label("NonH }, ExpectEgress: []olmv0util.EgressRule{ { - Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, + Ports: []olmv0util.Port{{}}, Selectors: nil, }, { - Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}}, - Selectors: []olmv0util.Selector{ - {NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}}, + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, }, + Selectors: nil, }, }, ExpectSelector: map[string]string{"app": "olm-operator"}, diff --git a/tests-extension/test/qe/specs/olmv0_networkpolicy.go b/tests-extension/test/qe/specs/olmv0_networkpolicy.go index 62676c89b2..db5052f7ab 100644 --- a/tests-extension/test/qe/specs/olmv0_networkpolicy.go +++ b/tests-extension/test/qe/specs/olmv0_networkpolicy.go @@ -52,14 +52,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() { }, ExpectEgress: []olmv0util.EgressRule{ { - Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, + Ports: []olmv0util.Port{{}}, Selectors: nil, }, { - Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}}, - Selectors: []olmv0util.Selector{ - {NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}}, + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, }, + Selectors: nil, }, { Ports: []olmv0util.Port{{Port: 50051, Protocol: "TCP"}}, @@ -88,14 +91,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() { }, ExpectEgress: []olmv0util.EgressRule{ { - Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, + Ports: []olmv0util.Port{{}}, Selectors: nil, }, { - Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}}, - Selectors: []olmv0util.Selector{ - {NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}}, + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, }, + Selectors: nil, }, }, ExpectSelector: map[string]string{"app": "olm-operator"}, @@ -112,14 +118,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() { }, ExpectEgress: []olmv0util.EgressRule{ { - Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, + Ports: []olmv0util.Port{{}}, Selectors: nil, }, { - Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}}, - Selectors: []olmv0util.Selector{ - {NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}}, + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, }, + Selectors: nil, }, }, ExpectSelector: map[string]string{"app": "package-server-manager"}, @@ -136,14 +145,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() { }, ExpectEgress: []olmv0util.EgressRule{ { - Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, + Ports: []olmv0util.Port{{}}, Selectors: nil, }, { - Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}}, - Selectors: []olmv0util.Selector{ - {NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}}, + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, }, + Selectors: nil, }, { Ports: []olmv0util.Port{{Port: 50051, Protocol: "TCP"}}, @@ -174,14 +186,17 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() { }, }, { - Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, + Ports: []olmv0util.Port{{}}, Selectors: nil, }, { - Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}}, - Selectors: []olmv0util.Selector{ - {NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}}, + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, }, + Selectors: nil, }, }, ExpectSelector: map[string]string{"app": "olm-collect-profiles"}, @@ -219,7 +234,16 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() { ExpectIngress: nil, ExpectEgress: []olmv0util.EgressRule{ { - Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, + Ports: []olmv0util.Port{{}}, + Selectors: nil, + }, + { + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, + }, Selectors: nil, }, }, @@ -291,12 +315,15 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() { {Ports: []olmv0util.Port{{Port: "metrics", Protocol: "TCP"}}, Selectors: nil}, }, ExpectEgress: []olmv0util.EgressRule{ - {Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, Selectors: nil}, + {Ports: []olmv0util.Port{{}}, Selectors: nil}, { - Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}}, - Selectors: []olmv0util.Selector{ - {NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}}, + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, }, + Selectors: nil, }, {Ports: []olmv0util.Port{{Port: 50051, Protocol: "TCP"}}, Selectors: nil}, }, @@ -318,12 +345,15 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() { {Ports: []olmv0util.Port{{Port: "metrics", Protocol: "TCP"}}, Selectors: nil}, }, ExpectEgress: []olmv0util.EgressRule{ - {Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, Selectors: nil}, + {Ports: []olmv0util.Port{{}}, Selectors: nil}, { - Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}}, - Selectors: []olmv0util.Selector{ - {NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}}, + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, }, + Selectors: nil, }, }, ExpectSelector: map[string]string{"app": "olm-operator"}, @@ -336,12 +366,15 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() { {Ports: []olmv0util.Port{{Port: 8443, Protocol: "TCP"}}, Selectors: nil}, }, ExpectEgress: []olmv0util.EgressRule{ - {Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, Selectors: nil}, + {Ports: []olmv0util.Port{{}}, Selectors: nil}, { - Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}}, - Selectors: []olmv0util.Selector{ - {NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}}, + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, }, + Selectors: nil, }, }, ExpectSelector: map[string]string{"app": "package-server-manager"}, @@ -354,12 +387,15 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() { {Ports: []olmv0util.Port{{Port: 5443, Protocol: "TCP"}}, Selectors: nil}, }, ExpectEgress: []olmv0util.EgressRule{ - {Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, Selectors: nil}, + {Ports: []olmv0util.Port{{}}, Selectors: nil}, { - Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}}, - Selectors: []olmv0util.Selector{ - {NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}}, + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, }, + Selectors: nil, }, {Ports: []olmv0util.Port{{Port: 50051, Protocol: "TCP"}}, Selectors: nil}, }, @@ -386,12 +422,15 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 networkpolicy", func() { {PodLabels: map[string]string{"app": "catalog-operator"}}, }, }, - {Ports: []olmv0util.Port{{Port: 6443, Protocol: "TCP"}}, Selectors: nil}, + {Ports: []olmv0util.Port{{}}, Selectors: nil}, { - Ports: []olmv0util.Port{{Port: "dns-tcp", Protocol: "TCP"}, {Port: "dns", Protocol: "UDP"}}, - Selectors: []olmv0util.Selector{ - {NamespaceLabels: map[string]string{"kubernetes.io/metadata.name": "openshift-dns"}}, + Ports: []olmv0util.Port{ + {Port: 53, Protocol: "TCP"}, + {Port: 53, Protocol: "UDP"}, + {Port: 5353, Protocol: "TCP"}, + {Port: 5353, Protocol: "UDP"}, }, + Selectors: nil, }, }, ExpectSelector: map[string]string{"app": "olm-collect-profiles"},