Skip to content

Commit

Permalink
UPSTREAM: <carry>: Drop machine-config workaround from e2e tests
Browse files Browse the repository at this point in the history
Thanks to some changes upstream in the e2e test suite we no longer
need to do this workaround. Waiting for the entire cluster to reboot
is now a waste of time and likely contributing to the timeouts that
occur on a regular basis.

(cherry picked from commit 53dab2e)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
  • Loading branch information
cybertron authored and dougsland committed May 17, 2023
1 parent 4be7520 commit e40cc8a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 63 deletions.
11 changes: 0 additions & 11 deletions hack/ocp-e2e-tests-handler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,6 @@ when name servers are wrong after state configuration|\
LLDP configuration with nmpolicy"
fi

# Apply machine configs and wait until machine config pools got updated
old_mcp_generation=$(oc get mcp master -o jsonpath={.metadata.generation})
if oc create -f test/e2e/machineconfigs.yaml; then
# If MCs could be created, wait until the MCP are aware of new machine configs
while [ "$old_mcp_generation" -eq "$(oc get mcp master -o jsonpath={.metadata.generation})" ]; do
echo "waiting for MCP update to start...";
sleep 1;
done
fi
while ! oc wait mcp --all --for=condition=Updated --timeout -1s; do sleep 1; done

make cluster-sync-operator
oc create -f test/e2e/nmstate.yaml
# On first deployment, it can take a while for all of the pods to come up
Expand Down
52 changes: 0 additions & 52 deletions test/e2e/machineconfigs.yaml

This file was deleted.

0 comments on commit e40cc8a

Please sign in to comment.