Use extra_args in persistentvolumes cluster up test
@@ -261,7 +261,7 @@ function os::test::extended::clusterup::portinuse_cleanup () {
# Verifies that clusterup handle different scenarios with persistent volumes setup
function os::test::extended::clusterup::persistentvolumes () {
- os::test::extended::clusterup::skip_persistent_volumes
+ os::test::extended::clusterup::skip_persistent_volumes "$@"
rm -rf /tmp/pv
}
@@ -324,15 +324,6 @@ docker tag openshift/origin-web-console:latest openshift/origin-web-console:${OR
# Ensure that KUBECONFIG is not set
unset KUBECONFIG
for test in "${tests[@]}"; do
- # Special case the console tests, which only run in the current release.
- # N-1 tests for the console should be enabled next release.
- if [ "$test" == "console" ]; then
- cleanup_func=$("os::test::extended::clusterup::cleanup_func" "${test}")
- # trap "${cleanup_func}; os::test::extended::clusterup::junit_cleanup" EXIT
- os::test::extended::clusterup::run_test "${test}" "--loglevel=2 --version=${ORIGIN_COMMIT}"
- # trap - EXIT
- ${cleanup_func}
- else
for extra_arg in "${extra_args[@]}"; do
cleanup_func=$("os::test::extended::clusterup::cleanup_func" "${test}")
# trap "${cleanup_func}; os::test::extended::clusterup::junit_cleanup" EXIT
@@ -340,7 +331,6 @@ for test in "${tests[@]}"; do
# trap - EXIT
${cleanup_func}
done
- fi
done
# os::test::extended::clusterup::junit_cleanup
