Skip to content

Commit

Permalink
Merge pull request #25831 from openshift-cherrypick-robot/cherry-pick…
Browse files Browse the repository at this point in the history
…-25827-to-release-4.6

[release-4.6] Bug 1921473: don't wait for PV removal in volumes.sh
  • Loading branch information
openshift-merge-robot committed Jan 28, 2021
2 parents d8174fc + d81aac5 commit 611a81b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion test/extended/testdata/bindata.go
Expand Up @@ -46900,7 +46900,7 @@ trap os::test::junit::reconcile_output EXIT
# Cleanup cluster resources created by this test
(
set +e
oc delete all,templates,pv,pvc --all
oc delete all,templates,pvc --all
exit 0
) &>/dev/null

Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/cmd/test/cmd/volumes.sh
Expand Up @@ -5,7 +5,7 @@ trap os::test::junit::reconcile_output EXIT
# Cleanup cluster resources created by this test
(
set +e
oc delete all,templates,pv,pvc --all
oc delete all,templates,pvc --all
exit 0
) &>/dev/null

Expand Down

0 comments on commit 611a81b

Please sign in to comment.