From 1aa2abe6fd80f6f4b003d7f163cdd1a8543cc473 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 10 Nov 2017 14:28:48 -0600 Subject: [PATCH] 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 --- ceph-volume-ansible-prs/build/build | 2 +- .../config/definitions/ceph-volume-pr.yml | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ceph-volume-ansible-prs/build/build b/ceph-volume-ansible-prs/build/build index 4f62a687..a11f7b67 100644 --- 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 a84b86f6..06cf78ff 100644 --- 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 -- 2.47.3