Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions test/run-e2e-ocp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ main() {
local -i ret=0
local -a extra_args=()
[[ -n "$POSTPONE_RESTORATION" ]] && extra_args+=(--postpone-restoration "$POSTPONE_RESTORATION")
# Increase test timeout when running on OpenShift because more tests are
# executed.
export TEST_TIMEOUT="${TEST_TIMEOUT:-30m}"
./test/run-e2e.sh --no-deploy --ns "$OPERATORS_NS" --ci "${extra_args[@]}" || ret=$?

# NOTE: delete_obo will be automatically called when script exits
Expand Down
23 changes: 11 additions & 12 deletions test/run-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ declare NO_BUILDS=false
declare SHOW_USAGE=false
declare LOGS_DIR="tmp/e2e"
declare OPERATORS_NS="operators"
declare TEST_TIMEOUT="15m"
declare TEST_TIMEOUT="${TEST_TIMEOUT:-15m}"
declare RUN_REGEX=""
declare POSTPONE_RESTORATION=""

Expand Down Expand Up @@ -359,17 +359,16 @@ reset_env() {
print_config() {
header "Test Configuration"
cat <<-EOF
image repo: $OBO_IMG_REPO
bundle: $BUNDLE_IMG
CI Mode: $CI_MODE
Skip Builds: $NO_BUILDS
Skip Deploy: $NO_DEPLOY
Postpone restoration: ${POSTPONE_RESTORATION:-disabled}
Operator namespace: $OPERATORS_NS
Logs directory: $LOGS_DIR
Run regex: $RUN_REGEX

EOF
image repo: $OBO_IMG_REPO
bundle: $BUNDLE_IMG
CI Mode: $CI_MODE
Skip Builds: $NO_BUILDS
Skip Deploy: $NO_DEPLOY
Postpone restoration: ${POSTPONE_RESTORATION:-disabled}
Operator namespace: $OPERATORS_NS
Logs directory: $LOGS_DIR
Run regex: $RUN_REGEX
EOF
line 50
}

Expand Down
Loading