diff --git a/hack/ocp-e2e-tests.sh b/hack/ocp-e2e-tests.sh index 9c0fb8848..f6a623113 100755 --- a/hack/ocp-e2e-tests.sh +++ b/hack/ocp-e2e-tests.sh @@ -19,9 +19,16 @@ export PRIMARY_NIC=enp2s0 export FIRST_SECONDARY_NIC=enp3s0 export SECOND_SECONDARY_NIC=enp4s0 +SKIPPED_TESTS="user-guide|bridged" + if oc get ns openshift-ovn-kubernetes &> /dev/null; then # We are using OVNKubernetes -> use enp1s0 as primary nic export PRIMARY_NIC=enp1s0 + SKIPPED_TESTS+="|NodeNetworkConfigurationPolicy bonding default interface|\ +with ping fail|\ +when connectivity to default gw is lost after state configuration|\ +when name servers are lost after state configuration|\ +when name servers are wrong after state configuration" fi # Apply machine configs and wait until machine config pools got updated @@ -45,4 +52,4 @@ while ! oc get pods -n nmstate | grep handler; do sleep 1; done # Then wait for them to be ready while oc get pods -n nmstate | grep "0/1"; do sleep 1; done # NOTE(bnemec): The test being filtered with "bridged" was re-enabled in 4.8, but seems to be consistently failing on OCP. -make test-e2e-handler E2E_TEST_ARGS="--skip=user-guide --skip=bridged" E2E_TEST_TIMEOUT=120m +make test-e2e-handler E2E_TEST_ARGS="--skip=\"${SKIPPED_TESTS}\"" E2E_TEST_TIMEOUT=120h