Skip to content

Commit

Permalink
Remove podspec-volumes-emptydir toggle (#358)
Browse files Browse the repository at this point in the history
Co-authored-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
  • Loading branch information
openshift-cherrypick-robot and nak3 committed Jun 14, 2023
1 parent 6abb0a9 commit 35789c9
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions openshift/e2e-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,11 @@ function run_e2e_tests(){
enable_feature_flags secure-pod-defaults || fail_test

if [ -n "$test_name" ]; then
enable_feature_flags kubernetes.podspec-volumes-emptydir || fail_test
go_test_e2e -tags=e2e -timeout=15m -parallel=1 \
./test/e2e ./test/conformance/api/... ./test/conformance/runtime/... \
-run "^(${test_name})$" \
--imagetemplate "$TEST_IMAGE_TEMPLATE" \
${OPENSHIFT_TEST_OPTIONS} || failed=$?
disable_feature_flags kubernetes.podspec-volumes-emptydir || fail_test

return $failed
fi

Expand All @@ -236,12 +233,10 @@ function run_e2e_tests(){
parallel=2
fi

enable_feature_flags kubernetes.podspec-volumes-emptydir || fail_test
go_test_e2e -tags=e2e -timeout=30m -parallel=$parallel \
./test/e2e ./test/conformance/api/... ./test/conformance/runtime/... \
--imagetemplate "$TEST_IMAGE_TEMPLATE" \
${OPENSHIFT_TEST_OPTIONS} || failed=1
disable_feature_flags kubernetes.podspec-volumes-emptydir || fail_test

enable_feature_flags tag-header-based-routing || fail_test
go_test_e2e -timeout=2m ./test/e2e/tagheader \
Expand Down Expand Up @@ -271,11 +266,11 @@ function run_e2e_tests(){
${OPENSHIFT_TEST_OPTIONS} || failed=1

# Run init-containers test
enable_feature_flags kubernetes.podspec-volumes-emptydir kubernetes.podspec-init-containers || fail_test
enable_feature_flags kubernetes.podspec-init-containers || fail_test
go_test_e2e -timeout=2m ./test/e2e/initcontainers \
--imagetemplate "$TEST_IMAGE_TEMPLATE" \
${OPENSHIFT_TEST_OPTIONS} || failed=1
disable_feature_flags kubernetes.podspec-volumes-emptydir kubernetes.podspec-init-containers || fail_test
disable_feature_flags kubernetes.podspec-init-containers || fail_test

# Run PVC test
enable_feature_flags kubernetes.podspec-persistent-volume-claim kubernetes.podspec-persistent-volume-write kubernetes.podspec-securitycontext || fail_test
Expand Down

0 comments on commit 35789c9

Please sign in to comment.