diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml index 697ddfe137..574515c016 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml @@ -21,6 +21,7 @@ export DEVSTACK_GATE_NEUTRON=1 export TEMPEST_CONCURRENCY=1 export KEEP_LOCALRC=1 + export MANILA_TESTS='tempest.cli.*manila*' echo "API_RATE_LIMIT=False" >> localrc echo "SHARE_BACKING_FILE_SIZE=12G" >> localrc echo "VOLUME_BACKING_FILE_SIZE=12G" >> localrc @@ -30,9 +31,8 @@ cp -r $BASE/new/manila/contrib/devstack/* $BASE/new/devstack # Install manila tempest integration cp -r $BASE/new/manila/contrib/tempest/tempest/* $BASE/new/tempest/tempest - tests_pathes='tempest.cli.*manila*' if [[ ! "$ZUUL_PROJECT" =~ "*python-manilaclient*" ]]; then - tests_pathes+=' tempest.api.share*'; + MANILA_TESTS+=' tempest.api.share*'; fi } export -f pre_test_hook @@ -43,7 +43,7 @@ cd $BASE/new/tempest sudo chown -R tempest:stack $BASE/new/tempest echo "Running tempest manila test suites" - sudo -H -u tempest tox -evenv bash tools/pretty_tox.sh \"$tests_pathes\" -- --concurrency=$TEMPEST_CONCURRENCY + sudo -H -u tempest tox -evenv bash tools/pretty_tox.sh \"$MANILA_TESTS\" -- --concurrency=$TEMPEST_CONCURRENCY } export -f post_test_hook