Skip to content

Reorg some test runs #3406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow-robot merged 1 commit into from
Jun 25, 2020
Merged

Reorg some test runs #3406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions test/e2e-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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() {
Copy link
Copy Markdown
Contributor

@vaikas vaikas Jun 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you mean to call this on L57 of the test?

Copy link
Copy Markdown
Member Author

@matzew matzew Jun 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vaikas Oh boy 🤦

ko apply --strict -f ${PRE_INSTALL_V016} || return 1
wait_until_batch_job_complete knative-eventing || return 1
}

Expand Down
3 changes: 1 addition & 2 deletions test/e2e-upgrade-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down