Skip to content

Attempt at fixing flakey tests #4700

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

Open
hlipsig wants to merge 7 commits into
base: master
Choose a base branch
from
+13 −4
Open

Attempt at fixing flakey tests #4700

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
deccbff
Attempt at fixing flakey tests
hlipsig Mar 19, 2026
37bacd3
Initial plan
Copilot Mar 20, 2026
7543a0a
Revert flakey test changes and increase SpecTimeout to 3 minutes
Copilot Mar 20, 2026
cf97afa
Update .bingo/go.mod
hlipsig Mar 20, 2026
b8451e7
Merge pull request #4701 from Azure/copilot/sub-pr-4700
hlipsig Mar 20, 2026
01d2b1c
update both tests to use the eventually time out functions. Clear the…
hlipsig Apr 3, 2026
4332e70
remove unneeded context in func()
hlipsig Apr 3, 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
47 changes: 34 additions & 13 deletions test/e2e/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,19 +435,34 @@ var _ = Describe("ARO Operator - MUO Deployment", func() {
managedUpgradeOperatorDeployment = "managed-upgrade-operator"
)

waitForMUODeploymentReady := func(ctx context.Context) {
Eventually(func(g Gomega, ctx context.Context) {
d, err := clients.Kubernetes.AppsV1().Deployments(managedUpgradeOperatorNamespace).Get(ctx, managedUpgradeOperatorDeployment, metav1.GetOptions{})
g.Expect(err).NotTo(HaveOccurred())
g.Expect(ready.DeploymentIsReady(d)).To(BeTrue(), "expected MUO deployment to be ready")
}).WithContext(ctx).WithTimeout(DefaultEventuallyTimeout).Should(Succeed())
}

It("must be restored if deleted", func(ctx context.Context) {
instance, err := clients.AROClusters.AroV1alpha1().Clusters().Get(ctx, "cluster", metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred())

if !instance.Spec.OperatorFlags.GetSimpleBoolean(operator.MuoEnabled) ||
!instance.Spec.OperatorFlags.GetSimpleBoolean(operator.MuoManaged) {
Skip("Managed Upgrade Operator controller is not enabled and managed, skipping test")
}

deleteFunc := clients.Kubernetes.AppsV1().Deployments(managedUpgradeOperatorNamespace).Delete
getFunc := clients.Kubernetes.AppsV1().Deployments(managedUpgradeOperatorNamespace).Get

By("waiting for the MUO deployment to be ready")
GetK8sObjectWithRetry(ctx, getFunc, managedUpgradeOperatorDeployment, metav1.GetOptions{})
waitForMUODeploymentReady(ctx)

By("deleting the MUO deployment")
DeleteK8sObjectWithRetry(ctx, deleteFunc, managedUpgradeOperatorDeployment, metav1.DeleteOptions{})

By("waiting for the MUO deployment to be reconciled")
GetK8sObjectWithRetry(ctx, getFunc, managedUpgradeOperatorDeployment, metav1.GetOptions{})
}, SpecTimeout(2*time.Minute))
By("waiting for the MUO deployment to be reconciled and ready")
waitForMUODeploymentReady(ctx)
})
})

var _ = Describe("ARO Operator - ImageConfig Reconciler", func() {
Expand Down Expand Up @@ -730,6 +745,14 @@ var _ = Describe("ARO Operator - Guardrails", func() {
gkAuditDeployment = "gatekeeper-audit"
)

waitForGatekeeperDeploymentReady := func(ctx context.Context, deploymentName string) {
Eventually(func(g Gomega, ctx context.Context) {
d, err := clients.Kubernetes.AppsV1().Deployments(guardrailsNamespace).Get(ctx, deploymentName, metav1.GetOptions{})
g.Expect(err).NotTo(HaveOccurred())
g.Expect(ready.DeploymentIsReady(d)).To(BeTrue(), "expected %q deployment to be ready", deploymentName)
}).WithContext(ctx).WithTimeout(DefaultEventuallyTimeout).Should(Succeed())
}

It("Controller Manager must be restored if deleted", func(ctx context.Context) {
instance, err := clients.AROClusters.AroV1alpha1().Clusters().Get(ctx, "cluster", metav1.GetOptions{})
Expect(err).NotTo(HaveOccurred())
Expand All @@ -739,17 +762,16 @@ var _ = Describe("ARO Operator - Guardrails", func() {
Skip("Guardrails Controller is not enabled, skipping test")
}

getFunc := clients.Kubernetes.AppsV1().Deployments(guardrailsNamespace).Get
deleteFunc := clients.Kubernetes.AppsV1().Deployments(guardrailsNamespace).Delete

By("waiting for the gatekeeper Controller Manager deployment to be ready")
GetK8sObjectWithRetry(ctx, getFunc, gkControllerManagerDeployment, metav1.GetOptions{})
waitForGatekeeperDeploymentReady(ctx, gkControllerManagerDeployment)

By("deleting the gatekeeper Controller Manager deployment")
DeleteK8sObjectWithRetry(ctx, deleteFunc, gkControllerManagerDeployment, metav1.DeleteOptions{})

By("waiting for the gatekeeper Controller Manager deployment to be reconciled")
GetK8sObjectWithRetry(ctx, getFunc, gkControllerManagerDeployment, metav1.GetOptions{})
By("waiting for the gatekeeper Controller Manager deployment to be reconciled and ready")
waitForGatekeeperDeploymentReady(ctx, gkControllerManagerDeployment)
})

It("Audit must be restored if deleted", func(ctx context.Context) {
Expand All @@ -761,17 +783,16 @@ var _ = Describe("ARO Operator - Guardrails", func() {
Skip("Guardrails Controller is not enabled, skipping test")
}

getFunc := clients.Kubernetes.AppsV1().Deployments(guardrailsNamespace).Get
deleteFunc := clients.Kubernetes.AppsV1().Deployments(guardrailsNamespace).Delete

By("waiting for the gatekeeper Audit deployment to be ready")
GetK8sObjectWithRetry(ctx, getFunc, gkAuditDeployment, metav1.GetOptions{})
waitForGatekeeperDeploymentReady(ctx, gkAuditDeployment)

By("deleting the gatekeeper Audit deployment")
DeleteK8sObjectWithRetry(ctx, deleteFunc, gkAuditDeployment, metav1.DeleteOptions{})

By("waiting for the gatekeeper Audit deployment to be reconciled")
GetK8sObjectWithRetry(ctx, getFunc, gkAuditDeployment, metav1.GetOptions{})
By("waiting for the gatekeeper Audit deployment to be reconciled and ready")
waitForGatekeeperDeploymentReady(ctx, gkAuditDeployment)
})
})

Expand Down
Loading