diff --git a/test/e2e-common.sh b/test/e2e-common.sh index f4569e9edf0..b31ecb059a5 100755 --- a/test/e2e-common.sh +++ b/test/e2e-common.sh @@ -45,8 +45,8 @@ readonly CHANNEL_BASED_BROKER_CONTROLLER="config/brokers/channel-broker" # Channel Based Broker config. readonly CHANNEL_BASED_BROKER_DEFAULT_CONFIG="test/config/st-channel-broker.yaml" -# PostInstall script for v0.15, storage migration -readonly POST_INSTALL_V015="config/post-install/v0.15.0" +# PreInstall script for v0.16 +readonly PRE_INSTALL_V016="config/pre-install/v0.16.0" # Should deploy a Knative Monitoring as well readonly DEPLOY_KNATIVE_MONITORING="${DEPLOY_KNATIVE_MONITORING:-1}" @@ -111,8 +111,8 @@ function install_latest_release() { fail_test "Knative latest release installation failed" } -function run_postinstall() { - ko apply --strict -f ${POST_INSTALL_V015} || return 1 +function run_preinstall_V016() { + ko apply --strict -f ${PRE_INSTALL_V016} || return 1 wait_until_batch_job_complete knative-eventing || return 1 } diff --git a/test/e2e-upgrade-tests.sh b/test/e2e-upgrade-tests.sh index 1600a2c4593..58c2678b093 100755 --- a/test/e2e-upgrade-tests.sh +++ b/test/e2e-upgrade-tests.sh @@ -55,12 +55,11 @@ echo "Prober PID is ${PROBER_PID}" wait_for_file /tmp/prober-ready || fail_test header "Performing upgrade to HEAD" +run_preinstall_V016 || fail_test 'Running preinstall 0.16 failed' install_head || fail_test 'Installing HEAD version of eventing failed' install_channel_crds || fail_test 'Installing HEAD channel CRDs failed' install_mt_broker || fail_test 'Installing HEAD Broker failed' -run_postinstall || fail_test 'Running postinstall failed' - header "Running postupgrade tests" go_test_e2e -tags=postupgrade -timeout="${TIMEOUT}" ./test/upgrade || fail_test