x/devstack-plugin-glusterfs
Code Issues Proposed changes

Fix devstack hooks for manila CI jobs

Browse Source 
Replace not available anymore "JOB_NAME" env var with
"GLUSTERFS_MANILA_DRIVER_TYPE" one in devstack hooks to unblock
CI jobs.

Change-Id: Ice8395325d20060df511b9de82c944200ceea2aa
This commit is contained in:
vponomaryov 2016-07-04 19:14:00 +03:00
parent 5d698eda71
commit d35a217dfb
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manila/post_test_hook.sh
View File

@ -23,9 +23,12 @@ sudo chmod -R o+rx $BASE/new/devstack/files
# Import devstack functions 'iniset'
source $BASE/new/devstack/functions
# Import env vars defined in CI job.
for env_var in ${DEVSTACK_LOCAL_CONFIG// / }; do
export $env_var;
done
if [[ "$JOB_NAME" =~ "glusterfs-native" ]]; then
if [[ "$GLUSTERFS_MANILA_DRIVER_TYPE" == "glusterfs-native" ]]; then
local BACKEND_NAME="GLUSTERNATIVE"
iniset $TEMPEST_CONFIG share enable_protocols glusterfs
iniset $TEMPEST_CONFIG share storage_protocol glusterfs
@ -37,7 +40,7 @@ if [[ "$JOB_NAME" =~ "glusterfs-native" ]]; then
# ro access_level is not supported by the driver.
iniset $TEMPEST_CONFIG share enable_ro_access_level_for_protocols
else
if [[ "$JOB_NAME" =~ "glusterfs-heketi" ]]; then
if [[ "$GLUSTERFS_MANILA_DRIVER_TYPE" == "glusterfs-heketi" ]]; then
local BACKEND_NAME="GLUSTERFSHEKETI"
else
local BACKEND_NAME="GLUSTERFS"
@ -94,15 +97,10 @@ cd $BASE/new/tempest
export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-12}
export MANILA_TESTS=${MANILA_TESTS:-'manila_tempest_tests.tests.api'}
if [[ "$JOB_NAME" =~ "scenario" ]]; then
echo "Set test set to scenario only"
MANILA_TESTS='manila_tempest_tests.tests.scenario'
fi
# check if tempest plugin was installed correctly
echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.test_plugins"))' | python
# Workaround for Tempest architectural changes
# Workaround for Tempest architectural changes (only for Liberty and lower releases)
# See bugs:
# 1) https://bugs.launchpad.net/manila/+bug/1531049
# 2) https://bugs.launchpad.net/tempest/+bug/1524717

14
manila/pre_test_hook.sh
View File

@ -20,21 +20,19 @@ echo "API_RATE_LIMIT=False" >> $localrc_path
echo "TEMPEST_SERVICES+=,manila" >> $localrc_path
echo "MANILA_USE_DOWNGRADE_MIGRATIONS=True" >> $localrc_path
echo "MANILA_MULTI_BACKEND=False" >> $localrc_path
# JOB_NAME is defined in openstack-infra/config project
# used by CI/CD, where this script is intended to be used.
if [[ "$JOB_NAME" =~ "multibackend" ]]; then
echo "MANILA_MULTI_BACKEND=True" >> $localrc_path
else
echo "MANILA_MULTI_BACKEND=False" >> $localrc_path
fi
# Import env vars defined in CI job.
for env_var in ${DEVSTACK_LOCAL_CONFIG// / }; do
export $env_var;
done
# If the job tests glusterfs (NFS) driver, then create default share_type with
# extra_spec snapshot_support as False. Becasuse the job that tests the
# glusterfs (NFS) driver tests the directory based layout that doesn't support
# snapshots. The job that tests glusterfs (NFS) driver has a name that
# ends with "glusterfs".
if [[ $JOB_NAME =~ manila-tempest-dsvm-glusterfs$ ]]; then
if [[ "$GLUSTERFS_MANILA_DRIVER_TYPE" == "glusterfs" ]]; then
echo "MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS='snapshot_support=False'" >> $localrc_path
fi