ceph-volume-ansible-prs: use subcommand to build the testing path

When using test_path jjb was rendering $TEST_PATH as a list. I'm unsure
exactly why, but using $SUBCOMMAND we can easily build the test path.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/ceph-volume-ansible-prs/build/build b/ceph-volume-ansible-prs/build/build
index 4f62a687422c05fb63ef1d4091d65d734e633642..a11f7b67fe4c11e455b4096881a933466ac6a2e6 100644 (file)
--- a/ceph-volume-ansible-prs/build/build
+++ b/ceph-volume-ansible-prs/build/build
@@ -44,6 +44,6 @@ fi
 pkgs=( "tox" )
 install_python_packages "pkgs[@]"
 
-cd $TEST_PATH
+cd src/ceph-volume/ceph_volume/tests/functional/$SUBCOMMAND
 
 CEPH_DEV_BRANCH=$BRANCH CEPH_DEV_SHA1=$SHA $VENV/tox --workdir=$WORKDIR -vre $DISTRO-$OBJECTSTORE-$SCENARIO -- --provider=libvirt

diff --git a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
index a84b86f679830a9c36c26959caf2953c7c1efdaf..06cf78ff0702e4a880a41d335dfcfe54f5d021fe 100644 (file)
--- a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
+++ b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
@@ -9,8 +9,6 @@
     scenario:
       - create
       - prepare_activate
-    test_path:
-      - src/ceph-volume/ceph_volume/tests/functional/lvm
     subcommand:
       - lvm
 
@@ -27,8 +25,6 @@
       - filestore
     scenario:
       - activate
-    test_path:
-      - src/ceph-volume/ceph_volume/tests/functional/simple
     subcommand:
       - simple
 
@@ -91,7 +87,7 @@
             SCENARIO={scenario}
             DISTRO={distro}
             OBJECTSTORE={objectstore}
-            TEST_PATH={test_path}
+            SUBCOMMAND={subcommand}
       - shell:
           !include-raw-escape:
             - ../../../scripts/build_utils.sh