Fix devstack hooks for manila CI jobs
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:
parent
5d698eda71
commit
d35a217dfb
|
@ -23,9 +23,12 @@ sudo chmod -R o+rx $BASE/new/devstack/files
|
||||||
# Import devstack functions 'iniset'
|
# Import devstack functions 'iniset'
|
||||||
source $BASE/new/devstack/functions
|
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 [[ "$GLUSTERFS_MANILA_DRIVER_TYPE" == "glusterfs-native" ]]; then
|
||||||
if [[ "$JOB_NAME" =~ "glusterfs-native" ]]; then
|
|
||||||
local BACKEND_NAME="GLUSTERNATIVE"
|
local BACKEND_NAME="GLUSTERNATIVE"
|
||||||
iniset $TEMPEST_CONFIG share enable_protocols glusterfs
|
iniset $TEMPEST_CONFIG share enable_protocols glusterfs
|
||||||
iniset $TEMPEST_CONFIG share storage_protocol 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.
|
# ro access_level is not supported by the driver.
|
||||||
iniset $TEMPEST_CONFIG share enable_ro_access_level_for_protocols
|
iniset $TEMPEST_CONFIG share enable_ro_access_level_for_protocols
|
||||||
else
|
else
|
||||||
if [[ "$JOB_NAME" =~ "glusterfs-heketi" ]]; then
|
if [[ "$GLUSTERFS_MANILA_DRIVER_TYPE" == "glusterfs-heketi" ]]; then
|
||||||
local BACKEND_NAME="GLUSTERFSHEKETI"
|
local BACKEND_NAME="GLUSTERFSHEKETI"
|
||||||
else
|
else
|
||||||
local BACKEND_NAME="GLUSTERFS"
|
local BACKEND_NAME="GLUSTERFS"
|
||||||
|
@ -94,15 +97,10 @@ cd $BASE/new/tempest
|
||||||
export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-12}
|
export MANILA_TEMPEST_CONCURRENCY=${MANILA_TEMPEST_CONCURRENCY:-12}
|
||||||
export MANILA_TESTS=${MANILA_TESTS:-'manila_tempest_tests.tests.api'}
|
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
|
# check if tempest plugin was installed correctly
|
||||||
echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.test_plugins"))' | python
|
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:
|
# See bugs:
|
||||||
# 1) https://bugs.launchpad.net/manila/+bug/1531049
|
# 1) https://bugs.launchpad.net/manila/+bug/1531049
|
||||||
# 2) https://bugs.launchpad.net/tempest/+bug/1524717
|
# 2) https://bugs.launchpad.net/tempest/+bug/1524717
|
||||||
|
|
|
@ -20,21 +20,19 @@ echo "API_RATE_LIMIT=False" >> $localrc_path
|
||||||
echo "TEMPEST_SERVICES+=,manila" >> $localrc_path
|
echo "TEMPEST_SERVICES+=,manila" >> $localrc_path
|
||||||
|
|
||||||
echo "MANILA_USE_DOWNGRADE_MIGRATIONS=True" >> $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
|
# Import env vars defined in CI job.
|
||||||
# used by CI/CD, where this script is intended to be used.
|
for env_var in ${DEVSTACK_LOCAL_CONFIG// / }; do
|
||||||
if [[ "$JOB_NAME" =~ "multibackend" ]]; then
|
export $env_var;
|
||||||
echo "MANILA_MULTI_BACKEND=True" >> $localrc_path
|
done
|
||||||
else
|
|
||||||
echo "MANILA_MULTI_BACKEND=False" >> $localrc_path
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If the job tests glusterfs (NFS) driver, then create default share_type with
|
# 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
|
# extra_spec snapshot_support as False. Becasuse the job that tests the
|
||||||
# glusterfs (NFS) driver tests the directory based layout that doesn't support
|
# glusterfs (NFS) driver tests the directory based layout that doesn't support
|
||||||
# snapshots. The job that tests glusterfs (NFS) driver has a name that
|
# snapshots. The job that tests glusterfs (NFS) driver has a name that
|
||||||
# ends with "glusterfs".
|
# 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
|
echo "MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS='snapshot_support=False'" >> $localrc_path
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue