Skip to content

NO-JIRA: Move test/e2e/accept.go to its own folder #2294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 3 commits into from
Jul 6, 2026
+32 −25
Merged

NO-JIRA: Move test/e2e/accept.go to its own folder #2294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
755f331
Move test/e2e/accept.go to its own folder
hongkailiu Jun 29, 2026
05c178e
Add test/e2e/admin/upgrade
hongkailiu Jun 29, 2026
86dfa4a
Fix the references of functions
hongkailiu Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions test/e2e/admin/upgrade/OWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
# This file just uses aliases defined in OWNERS_ALIASES.

approvers:
- update-approvers
12 changes: 7 additions & 5 deletions test/e2e/accept.go → test/e2e/admin/upgrade/accept/accept.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package e2e
package accept

import (
"context"
Expand All @@ -12,14 +12,16 @@ import (

configv1 "github.com/openshift/api/config/v1"
configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"

"github.com/openshift/oc/test/e2e"
)

var _ = g.Describe("[sig-cli][OCPFeatureGate:ClusterUpdateAcceptRisks] oc", g.Label("cluster-version-operator"), func() {

var (
ctx = context.TODO()
kubeConfigPath = KubeConfigPath()
oc = NewCLI("oc", kubeConfigPath).EnvVar("OC_ENABLE_CMD_UPGRADE_ACCEPT_RISKS", "true")
kubeConfigPath = e2e.KubeConfigPath()
oc = e2e.NewCLI("oc", kubeConfigPath).EnvVar("OC_ENABLE_CMD_UPGRADE_ACCEPT_RISKS", "true")
configClient *configv1client.ConfigV1Client
)

Expand All @@ -29,8 +31,8 @@ var _ = g.Describe("[sig-cli][OCPFeatureGate:ClusterUpdateAcceptRisks] oc", g.La
configClient, err = configv1client.NewForConfig(config)
o.Expect(err).NotTo(o.HaveOccurred())

skipIfMicroShift(oc)
SkipIfNotTechPreviewNoUpgrade(ctx, configClient)
e2e.SkipIfMicroShift(oc)
e2e.SkipIfNotTechPreviewNoUpgrade(ctx, configClient)

cv, err := configClient.ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
Expand Down
36 changes: 18 additions & 18 deletions test/e2e/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var _ = g.Describe("[sig-cli] Workloads test oc works well", func() {

// author: knarra@redhat.com
g.It("ROSA-OSD_CCS-ARO-Author:knarra-Medium-48681-Could start debug pod using pod definition yaml", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
buildPruningBaseDir := FixturePath("testdata", "oc_cli")
debugPodUsingDefinitionT := filepath.Join(buildPruningBaseDir, "debugpod_48681.yaml")

Expand Down Expand Up @@ -58,7 +58,7 @@ var _ = g.Describe("[sig-cli] Workloads test oc works well", func() {

// author: yinzhou@redhat.com
g.It("Author:yinzhou-NonPreRelease-Longduration-High-45307-Critical-45327-check oc adm prune deployments to prune RS [Serial][Timeout:30m]", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
skipIfDisconnected(oc)
g.By("create new namespace")
oc.SetupProject()
Expand Down Expand Up @@ -114,7 +114,7 @@ var _ = g.Describe("[sig-cli] Workloads test oc works well", func() {

// author: yinzhou@redhat.com
g.It("ROSA-OSD_CCS-ARO-Author:yinzhou-Medium-49859-should failed when oc import-image setting with Garbage values for --reference-policy", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
g.By("create new namespace")
oc.SetupProject()

Expand All @@ -131,7 +131,7 @@ var _ = g.Describe("[sig-cli] Workloads test oc works well", func() {

// author: yinzhou@redhat.com
g.It("ROSA-OSD_CCS-ARO-ConnectedOnly-NonPreRelease-Longduration-Author:yinzhou-High-42982-Describe quota output should always show units [Timeout:30m]", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
skipIfDisconnected(oc)
if isBaselineCapsSet(oc, "None") || isBaselineCapsSet(oc, "v4.13") || isBaselineCapsSet(oc, "v4.12") || isBaselineCapsSet(oc, "v4.14") || isBaselineCapsSet(oc, "v4.15") || isBaselineCapsSet(oc, "v4.11") && !isEnabledCapability(oc, "DeploymentConfig") {
skipMsg := "Skipping the test as baselinecaps have been set to None and some of API capabilities are not enabled!"
Expand Down Expand Up @@ -229,7 +229,7 @@ var _ = g.Describe("[sig-cli] Workloads test oc works well", func() {

// author: yinzhou@redhat.com
g.It("ROSA-OSD_CCS-ARO-ConnectedOnly-Author:yinzhou-Medium-51018-oc adm release extract support manifest list", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
skipIfDisconnected(oc)

if !assertPullSecret(oc) {
Expand Down Expand Up @@ -282,7 +282,7 @@ var _ = g.Describe("[sig-cli] Workloads test oc works well", func() {

// author: knarra@redhat.com
g.It("ROSA-OSD_CCS-ARO-ConnectedOnly-Author:knarra-Medium-66989-Workloads oc debug with or without init container for pod", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
skipIfDisconnected(oc)

oc.SetupProject()
Expand Down Expand Up @@ -328,7 +328,7 @@ var _ = g.Describe("[sig-cli] Workloads test oc works well", func() {

// author: yinzhou@redhat.com
g.It("ROSA-OSD_CCS-ARO-Author:yinzhou-LEVEL0-Critical-63002-oc new-app propagate containerPort information to the deployment if import-mode is PreserveOriginal", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
skipIfDisconnected(oc)
g.By("create new namespace")
oc.SetupProject()
Expand All @@ -342,7 +342,7 @@ var _ = g.Describe("[sig-cli] Workloads test oc works well", func() {

// author: knarra@redhat.com
g.It("ROSA-OSD_CCS-ARO-Author:knarra-LEVEL0-Critical-64921-Critical-63854-Verify oc adm release info and oc image extract using --idms-file flag", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
skipIfDisconnected(oc)

buildPruningBaseDir := FixturePath("testdata", "oc_cli")
Expand Down Expand Up @@ -440,7 +440,7 @@ var _ = g.Describe("[sig-cli] Workloads test oc works well", func() {

// author: yinzhou@redhat.com
g.It("ROSA-OSD_CCS-ARO-ConnectedOnly-Author:yinzhou-High-67013-oc image mirror with multi-arch images and --filter-by-os", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
skipIfDisconnected(oc)

if !assertPullSecret(oc) {
Expand Down Expand Up @@ -660,7 +660,7 @@ var _ = g.Describe("[sig-cli] Workloads client test", func() {

// author: yinzhou@redhat.com
g.It("ROSA-OSD_CCS-ARO-Longduration-NonPreRelease-Author:yinzhou-Medium-49395-oc debug node should exit when timeout [Timeout:30m]", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
workerNodeList, err := GetClusterNodesBy(oc, "worker")
o.Expect(err).NotTo(o.HaveOccurred())
g.By("Create new namespace")
Expand Down Expand Up @@ -707,7 +707,7 @@ var _ = g.Describe("[sig-cli] Workloads client test", func() {

// author: yinzhou@redhat.com
g.It("Author:yinzhou-ROSA-OSD_CCS-ARO-NonPreRelease-High-68647-oc whoami must work without oauth-apiserver", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
isExternalOIDCCluster, err := IsExternalOIDCCluster(oc)
o.Expect(err).NotTo(o.HaveOccurred())
if !isExternalOIDCCluster {
Expand Down Expand Up @@ -859,7 +859,7 @@ var _ = g.Describe("[sig-cli] Workloads client test", func() {

// author: yinzhou@redhat.com
g.It("ROSA-OSD_CCS-ARO-ConnectedOnly-Author:yinzhou-High-71178-Make sure no mismatch for sha256sum of openshift install for mac version", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
skipIfDisconnected(oc)

if !assertPullSecret(oc) {
Expand Down Expand Up @@ -901,7 +901,7 @@ var _ = g.Describe("[sig-cli] Workloads client test", func() {

// author: yinzhou@redhat.com
g.It("ROSA-OSD_CCS-ARO-ConnectedOnly-Author:yinzhou-Medium-71273-Medium-71275-Validate user is able to extract rhel8 and rhel9 oc from the ocp payload", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
skipIfDisconnected(oc)

if !assertPullSecret(oc) {
Expand Down Expand Up @@ -973,7 +973,7 @@ var _ = g.Describe("[sig-cli] Workloads client test", func() {
})
// author: yinzhou@redhat.com
g.It("ROSA-OSD_CCS-ARO-Author:yinzhou-Medium-72217-Should get warning when there is an identical short name for two or more resources", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
customResourceBaseDir := FixturePath("testdata", "oc_cli/case72217")
cronTabCRDF := filepath.Join(customResourceBaseDir, "crd-crontab-72217.yaml")
cronCRF := filepath.Join(customResourceBaseDir, "cr-cron-72217.yaml")
Expand Down Expand Up @@ -1024,7 +1024,7 @@ var _ = g.Describe("[sig-cli] Workloads client test", func() {
})

g.It("Author:yinzhou-ROSA-OSD_CCS-ARO-Medium-76150-Make sure oc debug node has set HOST env var", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
mnodeName, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("node", "-o=jsonpath={.items[0].metadata.name}").Output()
o.Expect(err).NotTo(o.HaveOccurred())
By("Create new namespace")
Expand All @@ -1044,7 +1044,7 @@ var _ = g.Describe("[sig-cli] Workloads client test", func() {
})

g.It("Author:yinzhou-ROSA-OSD_CCS-ARO-High-76116-Make sure oc could run on rhel with fips on", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
workerNodeList, err := GetClusterNodesBy(oc, "worker")
o.Expect(err).NotTo(o.HaveOccurred())
By("Create new namespace")
Expand Down Expand Up @@ -1077,7 +1077,7 @@ var _ = g.Describe("[sig-cli] Workloads client test", func() {
})

g.It("ROSA-OSD_CCS-ARO-ConnectedOnly-Author:yinzhou-Critical-11882-Return description of resources with cli describe", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
skipIfDisconnected(oc)
By("Create new namespace")
oc.SetupProject()
Expand Down Expand Up @@ -1114,7 +1114,7 @@ var _ = g.Describe("[sig-cli] Workloads client test", func() {
})

g.It("Author:yinzhou-ROSA-OSD_CCS-ARO-High-76287-make sure tools imagestream contains sosreport", oteginkgo.Informing(), func() {
skipIfMicroShift(oc)
SkipIfMicroShift(oc)
// Skip the case if cluster doest not have the imageRegistry installed
if !isEnabledCapability(oc, "ImageRegistry") {
skipMsg := "Skipped: cluster does not have imageRegistry installed"
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,9 +1050,9 @@ func isMicroShiftCluster(oc *CLI) bool {
return false
}

// skipIfMicroShift skips the test if running on a MicroShift cluster.
// SkipIfMicroShift skips the test if running on a MicroShift cluster.
// Use this for tests that are not compatible with MicroShift.
func skipIfMicroShift(oc *CLI) {
func SkipIfMicroShift(oc *CLI) {
if isMicroShiftCluster(oc) {
skipMsg := "Skipping test: not supported on MicroShift cluster"
e2e.Warningf("SKIPPING TEST: %s", skipMsg)
Expand Down