Skip to content
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.

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

fix: use thanos default port in service and containerPort #414

Merged
merged 4 commits into from
Mar 12, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 11 additions & 2 deletions test/run-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ declare SHOW_USAGE=false
declare LOGS_DIR="tmp/e2e"
declare OPERATORS_NS="operators"
declare TEST_TIMEOUT="15m"
declare RUN_REGEX=""

cleanup() {
info "Cleaning up ..."
Expand Down Expand Up @@ -154,7 +155,7 @@ run_e2e() {
watch_obo_errors "$obo_error_log" &

local ret=0
go test -v -failfast -timeout $TEST_TIMEOUT ./test/e2e/... --retain=true | tee "$LOGS_DIR/e2e.log" || ret=1
go test -v -failfast -timeout $TEST_TIMEOUT ./test/e2e/... -run "$RUN_REGEX" -count 1 | tee "$LOGS_DIR/e2e.log" || ret=1
Copy link
Contributor

Choose a reason for hiding this comment

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

neat on the addition on the regex!


# terminte both log_events
{ jobs -p | xargs -I {} -- pkill -TERM -P {}; } || true
Expand Down Expand Up @@ -203,6 +204,11 @@ parse_args() {
OPERATORS_NS=$1
shift
;;
--run)
shift
RUN_REGEX=$1
shift
;;
*) return 1 ;; # show usage on everything else
esac
done
Expand All @@ -227,7 +233,9 @@ print_usage() {
--no-builds skip building operator images, useful when operator image is already
built and pushed
--ns NAMESPACE namespace to deploy operators (default: $OPERATORS_NS)
For running against openshift use --ns openshift-operators
for running against openshift use --ns openshift-operators
--run REGEX regex to limit which tests are run. See go help testflag -run entry
for details


EOF_HELP
Expand Down Expand Up @@ -337,6 +345,7 @@ print_config() {
Skip Deploy: $NO_DEPLOY
Operator namespace: $OPERATORS_NS
Logs directory: $LOGS_DIR
Run regex: $RUN_REGEX

EOF
line 50
Expand Down