diff --git a/test/extended/clusterversion/OWNERS b/test/extended/clusterversion/OWNERS deleted file mode 100644 index 4ab021ebf3bb..000000000000 --- a/test/extended/clusterversion/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -reviewers: - - cluster-version-operator-test-case-reviewers - - Prashanth684 -approvers: - - cluster-version-operator-test-case-approvers diff --git a/test/extended/clusterversion/clusterversion.go b/test/extended/clusterversion/clusterversion.go deleted file mode 100644 index dd53468422bd..000000000000 --- a/test/extended/clusterversion/clusterversion.go +++ /dev/null @@ -1,43 +0,0 @@ -package clusterversion - -import ( - "context" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - - g "github.com/onsi/ginkgo/v2" - o "github.com/onsi/gomega" - configv1 "github.com/openshift/api/config/v1" - configclient "github.com/openshift/client-go/config/clientset/versioned" - exutil "github.com/openshift/origin/test/extended/util" -) - -// The desired architecture field was introduced as part of a feature that provides a toggle for an imagestream's importMode: https://github.com/openshift/api/pull/2024 -var _ = g.Describe("[sig-cluster-lifecycle][OCPFeatureGate:ImageStreamImportMode] ClusterVersion API", func() { - defer g.GinkgoRecover() - oc := exutil.NewCLIWithoutNamespace("") - - g.It("desired architecture should be valid when architecture is set in release payload metadata [apigroup:config.openshift.io]", func() { - TestClusterVersionDesiredArchitecture(g.GinkgoT(), oc) - }) - -}) - -func TestClusterVersionDesiredArchitecture(t g.GinkgoTInterface, oc *exutil.CLI) { - ctx := context.Background() - - archMetadata, _, err := oc.AsAdmin().Run("adm", "release", "info", `-ojsonpath={.metadata.metadata.release\.openshift\.io\/architecture}`).Outputs() - o.Expect(err).NotTo(o.HaveOccurred()) - - // Check desired.Architecture in the CV - configClient, err := configclient.NewForConfig(oc.AdminConfig()) - o.Expect(err).NotTo(o.HaveOccurred()) - clusterVersion, err := configClient.ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{}) - o.Expect(err).NotTo(o.HaveOccurred()) - - if archMetadata == "multi" { - o.Expect(clusterVersion.Status.Desired.Architecture).To(o.Equal(configv1.ClusterVersionArchitectureMulti)) - } else { - o.Expect(clusterVersion.Status.Desired.Architecture).To(o.BeEmpty()) - } -} diff --git a/test/extended/include.go b/test/extended/include.go index 0bfae962edc8..79dc851d5af9 100644 --- a/test/extended/include.go +++ b/test/extended/include.go @@ -19,7 +19,6 @@ import ( _ "github.com/openshift/origin/test/extended/cli" _ "github.com/openshift/origin/test/extended/cloud_controller_manager" _ "github.com/openshift/origin/test/extended/cluster" - _ "github.com/openshift/origin/test/extended/clusterversion" _ "github.com/openshift/origin/test/extended/cmd" _ "github.com/openshift/origin/test/extended/controller_manager" _ "github.com/openshift/origin/test/extended/coreos" diff --git a/test/extended/util/annotate/generated/zz_generated.annotations.go b/test/extended/util/annotate/generated/zz_generated.annotations.go index 32b180031c50..90043328178d 100644 --- a/test/extended/util/annotate/generated/zz_generated.annotations.go +++ b/test/extended/util/annotate/generated/zz_generated.annotations.go @@ -1035,8 +1035,6 @@ var Annotations = map[string]string{ "[sig-cluster-lifecycle][Feature:Machines][Serial] Managed cluster should grow and decrease when scaling different machineSets simultaneously [Timeout:30m][apigroup:machine.openshift.io]": " [Suite:openshift/conformance/serial]", - "[sig-cluster-lifecycle][OCPFeatureGate:ImageStreamImportMode] ClusterVersion API desired architecture should be valid when architecture is set in release payload metadata [apigroup:config.openshift.io]": " [Suite:openshift/conformance/parallel]", - "[sig-coreos] [Conformance] CoreOS bootimages TestBootimagesPresent [apigroup:machineconfiguration.openshift.io]": " [Suite:openshift/conformance/parallel/minimal]", "[sig-devex] check registry.redhat.io is available and samples operator can import sample imagestreams run sample related validations [apigroup:config.openshift.io][apigroup:image.openshift.io]": " [Skipped:Disconnected] [Suite:openshift/conformance/parallel]", diff --git a/zz_generated.manifests/test-reporting.yaml b/zz_generated.manifests/test-reporting.yaml index eac83704dc7c..c05bbbaf1e92 100644 --- a/zz_generated.manifests/test-reporting.yaml +++ b/zz_generated.manifests/test-reporting.yaml @@ -135,9 +135,6 @@ spec: mock driver Static provisioning should honor pv retain reclaim policy' - featureGate: ImageStreamImportMode tests: - - testName: '[sig-cluster-lifecycle][OCPFeatureGate:ImageStreamImportMode] ClusterVersion - API desired architecture should be valid when architecture is set in release - payload metadata [apigroup:config.openshift.io]' - testName: '[sig-imageregistry][OCPFeatureGate:ImageStreamImportMode][Serial] ImageStream API import mode should be Legacy if the import mode specified in image.config.openshift.io config is Legacy [apigroup:image.openshift.io]'