Skip to content

Commit 2445fcd

Browse files
authored
hack/tests/e2e-ansible*: fix travis ansible e2e tests (#2120)
1 parent bf1476a commit 2445fcd

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

hack/tests/e2e-ansible-molecule.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ deploy_prereqs() {
1919
}
2020

2121
remove_prereqs() {
22-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/service_account.yaml"
23-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/role.yaml"
24-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/role_binding.yaml"
25-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible.example.com_memcacheds_crd.yaml"
22+
kubectl delete --wait=true --ignore-not-found=true --timeout=60s -f "$OPERATORDIR/deploy/crds/ansible.example.com_memcacheds_crd.yaml"
23+
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/service_account.yaml"
24+
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/role.yaml"
25+
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/role_binding.yaml"
2626
}
2727

2828
pushd "$TMPDIR"

hack/tests/e2e-ansible.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ deploy_operator() {
2323
}
2424

2525
remove_operator() {
26-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/service_account.yaml"
27-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/role.yaml"
28-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/role_binding.yaml"
29-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible.example.com_memcacheds_crd.yaml"
30-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/crds/ansible.example.com_foos_crd.yaml"
31-
kubectl delete --ignore-not-found=true -f "$OPERATORDIR/deploy/operator.yaml"
26+
kubectl delete --wait=true --ignore-not-found=true --timeout=60s -f "$OPERATORDIR/deploy/crds/ansible.example.com_memcacheds_crd.yaml"
27+
kubectl delete --wait=true --ignore-not-found=true --timeout=60s -f "$OPERATORDIR/deploy/crds/ansible.example.com_foos_crd.yaml"
28+
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/operator.yaml"
29+
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/service_account.yaml"
30+
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/role.yaml"
31+
kubectl delete --wait=true --ignore-not-found=true -f "$OPERATORDIR/deploy/role_binding.yaml"
3232
}
3333

3434
operator_logs() {

0 commit comments

Comments
 (0)