diff --git a/openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json b/openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json index 7978faceb..01687668b 100644 --- a/openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json +++ b/openshift/tests-extension/.openshift-tests-extension/openshift_payload_olmv1.json @@ -523,7 +523,7 @@ } }, { - "name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[OTP][Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]", + "name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[OTP][Skipped:Disconnected]support disc with icsp[Timeout:40m] [Serial][Disruptive][Slow]", "originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]", "labels": { "Extended": {}, @@ -540,7 +540,7 @@ } }, { - "name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[OTP][Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]", + "name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[OTP][Skipped:Disconnected]support disc with itms and idms[Timeout:40m] [Serial][Disruptive][Slow]", "originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]", "labels": { "Extended": {}, @@ -608,7 +608,7 @@ } }, { - "name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[OTP][Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]", + "name": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[OTP][Skipped:Disconnected]authfile is updated automatically[Timeout:40m] [Serial][Disruptive][Slow]", "originalName": "[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]", "labels": { "Extended": {}, diff --git a/openshift/tests-extension/Makefile b/openshift/tests-extension/Makefile index 13c547920..c11c83a17 100644 --- a/openshift/tests-extension/Makefile +++ b/openshift/tests-extension/Makefile @@ -104,12 +104,15 @@ pkg/bindata/singleown/index/index.go: $(shell find testdata/singleown/index -typ go fmt ./$(@D)/... bindata: pkg/bindata/qe/bindata.go -pkg/bindata/qe/bindata.go: $(shell find test/qe/testdata -type f) +pkg/bindata/qe/bindata.go: FORCE mkdir -p $(@D) $(GO_BINDATA) -nocompress -nometadata \ -pkg testdata -o $@ -prefix "testextended" test/qe/testdata/... gofmt -s -w $@ +.PHONY: FORCE +FORCE: + # GO_COMPLIANCE_POLICY="exempt_all" must only be used for test related binaries. # It prevents various FIPS compliance policies from being applied to this compilation. # Do not set globally. diff --git a/openshift/tests-extension/test/qe/specs/olmv1_ce.go b/openshift/tests-extension/test/qe/specs/olmv1_ce.go index 226b6075d..c80ff2da1 100644 --- a/openshift/tests-extension/test/qe/specs/olmv1_ce.go +++ b/openshift/tests-extension/test/qe/specs/olmv1_ce.go @@ -166,11 +166,13 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh exutil.SkipForSNOCluster(oc) olmv1util.ValidateAccessEnvironment(oc) var ( - ns = "ns-68936" - sa = "68936" + caseID = "68936" + ns = "ns-" + caseID + sa = caseID + labelValue = caseID baseDir = exutil.FixturePath("testdata", "olm") - clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml") - clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml") + clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml") + clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml") saClusterRoleBindingOperandTemplate = filepath.Join(baseDir, "sa-nginx-insufficient-operand-clusterrole.yaml") saCrb = olmv1util.SaCLusterRolebindingDescription{ Name: sa, @@ -188,9 +190,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh Template: saClusterRoleBindingOperandTemplate, } clustercatalog = olmv1util.ClusterCatalogDescription{ - Name: "clustercatalog-68936", - Imageref: "quay.io/olmqe/nginx-ok-index:vokv68936", - Template: clustercatalogTemplate, + Name: "clustercatalog-68936", + Imageref: "quay.io/olmqe/nginx-ok-index:vokv68936", + LabelValue: labelValue, + Template: clustercatalogTemplate, } ceInsufficient = olmv1util.ClusterExtensionDescription{ Name: "insufficient-68936", @@ -199,6 +202,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh Version: ">=0.0.1", InstallNamespace: ns, SaName: sa, + LabelValue: labelValue, Template: clusterextensionTemplate, } ) @@ -235,11 +239,13 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh exutil.SkipForSNOCluster(oc) olmv1util.ValidateAccessEnvironment(oc) var ( - ns = "ns-68937" - sa = "68937" + caseID = "68937" + ns = "ns-" + caseID + sa = caseID + labelValue = caseID baseDir = exutil.FixturePath("testdata", "olm") - clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml") - clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml") + clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml") + clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml") saClusterRoleBindingOperandTemplate = filepath.Join(baseDir, "sa-nginx-insufficient-operand-rbac.yaml") saCrb = olmv1util.SaCLusterRolebindingDescription{ Name: sa, @@ -257,9 +263,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh Template: saClusterRoleBindingOperandTemplate, } clustercatalog = olmv1util.ClusterCatalogDescription{ - Name: "clustercatalog-68937", - Imageref: "quay.io/olmqe/nginx-ok-index:vokv68937", - Template: clustercatalogTemplate, + Name: "clustercatalog-68937", + Imageref: "quay.io/olmqe/nginx-ok-index:vokv68937", + LabelValue: labelValue, + Template: clustercatalogTemplate, } ceInsufficient = olmv1util.ClusterExtensionDescription{ Name: "insufficient-68937", @@ -268,6 +275,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh Version: ">=0.0.1", InstallNamespace: ns, SaName: sa, + LabelValue: labelValue, Template: clusterextensionTemplate, } ) @@ -882,11 +890,13 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh exutil.SkipForSNOCluster(oc) olmv1util.ValidateAccessEnvironment(oc) var ( - ns = "ns-74618" - sa = "sa74618" + caseID = "74618" + ns = "ns-" + caseID + sa = "sa" + caseID + labelValue = caseID baseDir = exutil.FixturePath("testdata", "olm") - clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml") - clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml") + clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml") + clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml") saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml") saCrb = olmv1util.SaCLusterRolebindingDescription{ Name: sa, @@ -894,9 +904,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh Template: saClusterRoleBindingTemplate, } clustercatalog = olmv1util.ClusterCatalogDescription{ - Name: "clustercatalog-74618", - Imageref: "quay.io/olmqe/nginx-ok-index:vokv32777", - Template: clustercatalogTemplate, + Name: "clustercatalog-74618", + Imageref: "quay.io/olmqe/nginx-ok-index:vokv32777", + LabelValue: labelValue, + Template: clustercatalogTemplate, } ceGVK = olmv1util.ClusterExtensionDescription{ Name: "dep-gvk-32777", @@ -905,6 +916,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh Version: ">=0.0.1", InstallNamespace: ns, SaName: sa, + LabelValue: labelValue, Template: clusterextensionTemplate, } cePKG = olmv1util.ClusterExtensionDescription{ @@ -915,6 +927,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh InstallNamespace: ns, UpgradeConstraintPolicy: "SelfCertified", SaName: sa, + LabelValue: labelValue, Template: clusterextensionTemplate, } ceCST = olmv1util.ClusterExtensionDescription{ @@ -924,6 +937,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh Version: ">=0.0.1", InstallNamespace: ns, SaName: sa, + LabelValue: labelValue, Template: clusterextensionTemplate, } ceWBH = olmv1util.ClusterExtensionDescription{ @@ -934,6 +948,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh InstallNamespace: ns, UpgradeConstraintPolicy: "SelfCertified", SaName: sa, + LabelValue: labelValue, Template: clusterextensionTemplate, } ceNAN = olmv1util.ClusterExtensionDescription{ @@ -943,6 +958,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh Version: ">=0.0.1", InstallNamespace: ns, SaName: sa, + LabelValue: labelValue, Template: clusterextensionTemplate, } ) @@ -1001,7 +1017,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh }) - g.It("PolarionID:76843-[OTP][Skipped:Disconnected]support disc with icsp[Timeout:30m] [Disruptive][Slow]", g.Label("original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]"), func() { + g.It("PolarionID:76843-[OTP][Skipped:Disconnected]support disc with icsp[Timeout:40m] [Disruptive][Slow]", g.Label("original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76843-[Skipped:Disconnected]support disc with icsp[Timeout:30m] [Serial][Disruptive][Slow]"), func() { exutil.SkipForSNOCluster(oc) var ( caseID = "76843" @@ -1012,8 +1028,8 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh ceName = "ce-" + caseID iscpName = "icsp-" + caseID baseDir = exutil.FixturePath("testdata", "olm") - clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml") - clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml") + clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml") + clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml") saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml") icspTemplate = filepath.Join(baseDir, "icsp-single-mirror.yaml") icsp = olmv1util.IcspDescription{ @@ -1023,9 +1039,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh Template: icspTemplate, } clustercatalog = olmv1util.ClusterCatalogDescription{ - Name: catalogName, - Imageref: "qe76843.myregistry.io/olmqe/nginx-ok-index@sha256:c613ddd68b74575d823c6f370c0941b051ea500aa4449224489f7f2cc716e712", - Template: clustercatalogTemplate, + Name: catalogName, + Imageref: "qe76843.myregistry.io/olmqe/nginx-ok-index@sha256:c613ddd68b74575d823c6f370c0941b051ea500aa4449224489f7f2cc716e712", + LabelValue: labelValue, + Template: clustercatalogTemplate, } saCrb = olmv1util.SaCLusterRolebindingDescription{ Name: sa, @@ -1082,7 +1099,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh }) - g.It("PolarionID:76844-[OTP][Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Disruptive][Slow]", g.Label("original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]"), func() { + g.It("PolarionID:76844-[OTP][Skipped:Disconnected]support disc with itms and idms[Timeout:40m] [Disruptive][Slow]", g.Label("original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76844-[Skipped:Disconnected]support disc with itms and idms[Timeout:30m] [Serial][Disruptive][Slow]"), func() { exutil.SkipOnProxyCluster(oc) exutil.SkipForSNOCluster(oc) var ( @@ -1094,8 +1111,8 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh ceName = "ce-" + caseID itdmsName = "itdms-" + caseID baseDir = exutil.FixturePath("testdata", "olm") - clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml") - clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml") + clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml") + clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml") saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml") itdmsTemplate = filepath.Join(baseDir, "itdms-full-mirror.yaml") itdms = olmv1util.ItdmsDescription{ @@ -1107,9 +1124,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh Template: itdmsTemplate, } clustercatalog = olmv1util.ClusterCatalogDescription{ - Name: catalogName, - Imageref: "qe76844.myregistry.io/olmqe/nginx-ok-index:vokv76844", - Template: clustercatalogTemplate, + Name: catalogName, + Imageref: "qe76844.myregistry.io/olmqe/nginx-ok-index:vokv76844", + LabelValue: labelValue, + Template: clustercatalogTemplate, } saCrb = olmv1util.SaCLusterRolebindingDescription{ Name: sa, @@ -1181,8 +1199,8 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh ceName = "ce-" + caseID cipName = "cip-" + caseID baseDir = exutil.FixturePath("testdata", "olm") - clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml") - clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml") + clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml") + clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml") saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml") cipTemplate = filepath.Join(baseDir, "cip.yaml") cip = olmv1util.CipDescription{ @@ -1194,14 +1212,16 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh Template: cipTemplate, } clustercatalog = olmv1util.ClusterCatalogDescription{ - Name: catalogName, - Imageref: "quay.io/olmqe/nginx-ok-index-sigstore:vokv78193", - Template: clustercatalogTemplate, + Name: catalogName, + Imageref: "quay.io/olmqe/nginx-ok-index-sigstore:vokv78193", + LabelValue: labelValue, + Template: clustercatalogTemplate, } clustercatalog1 = olmv1util.ClusterCatalogDescription{ - Name: catalog1Name, - Imageref: "quay.io/olmqe/nginx-ok-index-sigstore1:vokv781931", - Template: clustercatalogTemplate, + Name: catalog1Name, + Imageref: "quay.io/olmqe/nginx-ok-index-sigstore1:vokv781931", + LabelValue: labelValue, + Template: clustercatalogTemplate, } saCrb = olmv1util.SaCLusterRolebindingDescription{ Name: sa, @@ -1272,8 +1292,8 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh ceName = "ce-" + caseID cipName = "cip-" + caseID baseDir = exutil.FixturePath("testdata", "olm") - clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml") - clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml") + clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml") + clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml") saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml") cipTemplate = filepath.Join(baseDir, "cip.yaml") cip = olmv1util.CipDescription{ @@ -1286,9 +1306,10 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh Template: cipTemplate, } clustercatalog = olmv1util.ClusterCatalogDescription{ - Name: catalogName, - Imageref: imageRef, - Template: clustercatalogTemplate, + Name: catalogName, + Imageref: imageRef, + LabelValue: labelValue, + Template: clustercatalogTemplate, } saCrb = olmv1util.SaCLusterRolebindingDescription{ Name: sa, @@ -1348,13 +1369,14 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh catalogName = "clustercatalog-" + caseID ceName = "ce-" + caseID baseDir = exutil.FixturePath("testdata", "olm") - clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog.yaml") - clusterextensionTemplate = filepath.Join(baseDir, "clusterextension.yaml") + clustercatalogTemplate = filepath.Join(baseDir, "clustercatalog-withlabel.yaml") + clusterextensionTemplate = filepath.Join(baseDir, "clusterextension-withselectorlabel.yaml") saClusterRoleBindingTemplate = filepath.Join(baseDir, "sa-admin.yaml") clustercatalog = olmv1util.ClusterCatalogDescription{ - Name: catalogName, - Imageref: "quay.io/olmqe/nginx-ok-index-private:vokv76983", - Template: clustercatalogTemplate, + Name: catalogName, + Imageref: "quay.io/olmqe/nginx-ok-index-private:vokv76983", + LabelValue: labelValue, + Template: clustercatalogTemplate, } saCrb = olmv1util.SaCLusterRolebindingDescription{ Name: sa, @@ -1410,7 +1432,7 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh }) - g.It("PolarionID:76985-[OTP][Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Disruptive][Slow]", g.Label("original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]"), func() { + g.It("PolarionID:76985-[OTP][Skipped:Disconnected]authfile is updated automatically[Timeout:40m] [Disruptive][Slow]", g.Label("original-name:[sig-olmv1][Jira:OLM] clusterextension PolarionID:76985-[Skipped:Disconnected]authfile is updated automatically[Timeout:30m] [Serial][Disruptive][Slow]"), func() { exutil.SkipForSNOCluster(oc) var ( caseID = "76985"