Skip to content

Check that user specified arguments if required #381

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

Open
brianphaley wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Check that user specified arguments if required #381

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
18 changes: 18 additions & 0 deletions openstack/tools/charmed_openstack_functest_runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ OPTIONS:
enough capacity to boot the vms required by the tests.
--sleep TIME_SECS
Specify amount of seconds to sleep between functest steps.
--debug
Run with debug (-x) enabled.
--help
This help message.
EOF
Expand Down Expand Up @@ -143,6 +145,10 @@ while (($# > 0)); do
set -x
;;
--func-test-target)
if [[ $# < 2 ]]; then

@pponnuvel pponnuvel May 7, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Perhaps this could be wrapped in a function in openstack/tools/func_test_tools/common.sh to avoid repeating the same check, like:

require_opt_arg() {
    if [[ $# -lt 2 ]]; then
        echo "ERROR: '$1' requires argument"
        exit 1
    fi
}

And then called with: require_opt_arg "$@"

@nicolasbock nicolasbock May 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
if [[ $# < 2 ]]; then
if (( $# < 2 )); then

It's better to use an arithmetic expression if comparing this way.

echo "ERROR: '$1' requires argument"
exit 1
fi
FUNC_TEST_TARGET+=( $2 )
shift
;;
Expand All @@ -157,11 +163,19 @@ while (($# > 0)); do
WAIT_ON_DESTROY=false
;;
--remote-build)
if [[ $# < 2 ]]; then

@nicolasbock nicolasbock May 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same here.

echo "ERROR: '$1' requires argument"
exit 1
fi
REMOTE_BUILD=$2
SKIP_BUILD=true
shift
;;
--rerun)
if [[ $# < 2 ]]; then
echo "ERROR: '$1' requires argument"
exit 1
fi
RERUN_PHASE=$2
[[ $2 = deploy ]] || [[ $2 = configure ]] || [[ $2 = test ]] || opt_error $1 $2
shift
Expand All @@ -173,6 +187,10 @@ while (($# > 0)); do
SKIP_BUILD=true
;;
--sleep)
if [[ $# < 2 ]]; then
echo "ERROR: '$1' requires argument"
exit 1
fi
SLEEP=$2
shift
;;
Expand Down
14 changes: 14 additions & 0 deletions openstack/tools/openstack_regression_tests_runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ OPTIONS:
By default we modify test bundle constraints to ensure that applications
have the resources they need. For example nova-compute needs to have
enough capacity to boot the vms required by the tests.
--debug
Run with debug (-x) enabled.
--help
This help message.
EOF
Expand All @@ -47,14 +49,26 @@ while (($# > 0)); do
set -x
;;
--func-test-target)
if [[ $# < 2 ]]; then
echo "ERROR: '$1' requires argument"
exit 1
fi
FUNC_TEST_TARGET=$2
shift
;;
--func-test-pr)
if [[ $# < 2 ]]; then
echo "ERROR: '$1' requires argument"
exit 1
fi
FUNC_TEST_PR=$2
shift
;;
--rerun)
if [[ $# < 2 ]]; then
echo "ERROR: '$1' requires argument"
exit 1
fi
RERUN_PHASE=$2
[[ $2 = configure ]] || [[ $2 = test ]] || opt_error $1 $2
shift
Expand Down
Loading