From: Brad Hubbard <bhubbard@redhat.com>
Date: Mon, 30 Mar 2020 02:18:49 +0000 (+1000)
Subject: tests: Reinstate "opts" as final argument
X-Git-Tag: v17.0.0~2780^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c951132aee665bdb9f6f3018f39efbfb390f1559;p=ceph.git

tests: Reinstate "opts" as final argument

a1e8f61cb72 broke the "opts" argument.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/src/test/docker-test-helper.sh b/src/test/docker-test-helper.sh
index 14814201cbe57..80771eb14dd43 100755
--- a/src/test/docker-test-helper.sh
+++ b/src/test/docker-test-helper.sh
@@ -24,8 +24,8 @@ function get_image_name() {
 function setup_container() {
     local os_type=$1
     local os_version=$2
-    local opts="$3"
-    local dockercmd=$4
+    local dockercmd=$3
+    local opts="$4"
 
     local image=$(get_image_name $os_type $os_version)
     local build=true
@@ -108,14 +108,14 @@ function run_in_docker() {
     shift
     local ref=$1
     shift
+    local dockercmd=$1
+    shift
     local opts="$1"
     shift
     local script=$1
-    shift
-    local dockercmd=$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 image=$(get_image_name $os_type $os_version)
     local upstream=$(get_upstream)
@@ -327,9 +327,9 @@ function main_docker() {
             if $remove ; then
                 remove_all $os_type $os_version $dockercmd || return 1
             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
-                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
         done
     done