RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-23 10:48:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Reinstate "opts" as final argument

Browse Source 
a1e8f61cb7 broke the "opts" argument.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
This commit is contained in:
Brad Hubbard 2020-03-30 12:18:49 +10:00
parent 011e7b3736
commit c951132aee
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/docker-test-helper.sh
View File

@ -24,8 +24,8 @@ function get_image_name() {
function setup_container() { function setup_container() {
local os_type=$1 local os_type=$1
local os_version=$2 local os_version=$2
local opts="$3" local dockercmd=$3
local dockercmd=$4 local opts="$4"
local image=$(get_image_name $os_type $os_version) local image=$(get_image_name $os_type $os_version)
local build=true local build=true
@ -108,14 +108,14 @@ function run_in_docker() {
shift shift
local ref=$1 local ref=$1
shift shift
local dockercmd=$1
shift
local opts="$1" local opts="$1"
shift shift
local script=$1 local script=$1
shift
local dockercmd=$1
setup_downstream $os_type $os_version $ref || return 1 setup_downstream $os_type $os_version $ref || return 1
setup_container $os_type $os_version "$opts" $dockercmd || return 1 setup_container $os_type $os_version $dockercmd "$opts" || return 1
local downstream=$(get_downstream $os_type $os_version) local downstream=$(get_downstream $os_type $os_version)
local image=$(get_image_name $os_type $os_version) local image=$(get_image_name $os_type $os_version)
local upstream=$(get_upstream) local upstream=$(get_upstream)
@ -327,9 +327,9 @@ function main_docker() {
if $remove ; then if $remove ; then
remove_all $os_type $os_version $dockercmd || return 1 remove_all $os_type $os_version $dockercmd || return 1
elif $shell ; then elif $shell ; then
run_in_docker $os_type $os_version $ref "$opts" SHELL $dockercmd || return 1 run_in_docker $os_type $os_version $ref $dockercmd "$opts" SHELL || return 1
else else
run_in_docker $os_type $os_version $ref "$opts" "$@" $dockercmd || return 1 run_in_docker $os_type $os_version $ref $dockercmd "$opts" "$@" || return 1
fi fi
done done
done done