Skip to content

Fix flaky TestStaleAnnotationClearedOnLayerOnlyChange #5995

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
dkhater-redhat wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix flaky TestStaleAnnotationClearedOnLayerOnlyChange #5995

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions test/e2e-ocl-2of2/onclusterlayering_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,16 +1380,12 @@ func containsMiddle(s, substr string) bool {
func TestStaleAnnotationClearedOnLayerOnlyChange(t *testing.T) {
cs := framework.NewClientSet("")

// Label a node from worker pool to trigger node controller reconciliation
unlabelFunc := helpers.LabelRandomNodeFromPool(t, cs, "worker", "node-role.kubernetes.io/layered")
t.Cleanup(unlabelFunc)

ctx, cancel := context.WithCancel(context.Background())
t.Cleanup(cancel)

kubeassert := helpers.AssertClientSet(t, cs).WithContext(ctx)

// Step 1: Setup OCL with initial successful build
// Step 1: Setup OCL with initial successful build (pool starts with no nodes)
t.Logf("Step 1: Setting up On-Cluster Layering with initial build")
firstImagePullspec, firstMOSB := runOnClusterLayeringTest(t, onClusterLayeringTestOpts{
poolName: layeredMCPName,
Expand All @@ -1414,8 +1410,8 @@ func TestStaleAnnotationClearedOnLayerOnlyChange(t *testing.T) {
t.Logf("First rendered config: %s", firstRenderedConfig)

// Wait for pool to finish updating before applying next MC
t.Logf("Waiting for pool to finish initial update")
err = wait.PollUntilContextTimeout(ctx, 5*time.Second, 10*time.Minute, true, func(ctx context.Context) (bool, error) {
t.Logf("Waiting for pool to finish initial update (pool has no nodes yet)")
err = wait.PollUntilContextTimeout(ctx, 5*time.Second, 2*time.Minute, true, func(ctx context.Context) (bool, error) {
mcp, err := cs.MachineConfigPools().Get(ctx, layeredMCPName, metav1.GetOptions{})
if err != nil {
return false, err
Expand All @@ -1425,6 +1421,10 @@ func TestStaleAnnotationClearedOnLayerOnlyChange(t *testing.T) {
})
require.NoError(t, err, "pool did not reach Updated=True")

t.Logf("Adding a node to the pool to enable stale annotation testing")
unlabelFunc := helpers.LabelRandomNodeFromPool(t, cs, "worker", "node-role.kubernetes.io/layered")
t.Cleanup(unlabelFunc)

// Step 2: Apply first SSH key MC (layer-only change) -> rendered-worker-2
t.Logf("Step 2: Applying first SSH key (layer-only change)")
sshKey1Config := ign3types.Config{
Expand Down