From 32db6382df72d2d91600d7daa41b7abf53c666d8 Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Tue, 18 May 2021 11:58:07 -0700 Subject: [PATCH] [stable/victoria-only] Set max api version via plugin.sh manila's tempest plugin is branchless and can at any time add tests for API microversions incompatible with this stable branch. We used to configure test API versions via the post test hook when relying on devstack-gate. However, API version config makes sense whenever we use devstack and have tempest enabled. This will help us simplify default job configuration in the manila-tempest-plugin repository. Since the API version won't change on a stable branch, hard-coding the versions (as other micro-versioned services do in their devstack) doesn't pose any risk of failing reality. Closes-Bug: #1928879 Change-Id: Iab83cf3fa629455f058ce6c8668b20e59e9450cf Signed-off-by: Goutham Pacha Ravi --- contrib/ci/post_test_hook.sh | 17 ----------------- devstack/plugin.sh | 4 ++++ 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh index f3649d8cc6..18fe5fd0c8 100755 --- a/contrib/ci/post_test_hook.sh +++ b/contrib/ci/post_test_hook.sh @@ -56,23 +56,6 @@ else fi iniset $TEMPEST_CONFIG share backend_names $BACKENDS_NAMES -# If testing a stable branch, we need to ensure we're testing with supported -# API micro-versions; so set the versions from code if we're not testing the -# master branch. If we're testing master, we'll allow manila-tempest-plugin -# (which is branchless) tell us what versions it wants to test. -if [[ $ZUUL_BRANCH != "master" ]]; then - # Grab the supported API micro-versions from the code - _API_VERSION_REQUEST_PATH=$BASE/new/manila/manila/api/openstack/api_version_request.py - _DEFAULT_MIN_VERSION=$(awk '$0 ~ /_MIN_API_VERSION = /{print $3}' $_API_VERSION_REQUEST_PATH) - _DEFAULT_MAX_VERSION=$(awk '$0 ~ /_MAX_API_VERSION = /{print $3}' $_API_VERSION_REQUEST_PATH) - # Override the *_api_microversion tempest options if present - MANILA_TEMPEST_MIN_API_MICROVERSION=${MANILA_TEMPEST_MIN_API_MICROVERSION:-$_DEFAULT_MIN_VERSION} - MANILA_TEMPEST_MAX_API_MICROVERSION=${MANILA_TEMPEST_MAX_API_MICROVERSION:-$_DEFAULT_MAX_VERSION} - # Set these options in tempest.conf - iniset $TEMPEST_CONFIG share min_api_microversion $MANILA_TEMPEST_MIN_API_MICROVERSION - iniset $TEMPEST_CONFIG share max_api_microversion $MANILA_TEMPEST_MAX_API_MICROVERSION -fi - # Set two retries for CI jobs iniset $TEMPEST_CONFIG share share_creation_retry_number 2 diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 7d3d983b2d..f618dd6384 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -946,6 +946,10 @@ function update_tempest { iniset $TEMPEST_CONFIG identity alt_password $ADMIN_PASSWORD iniset $TEMPEST_CONFIG identity alt_tenant_name ${ALT_TENANT_NAME:-"alt_demo"} iniset $TEMPEST_CONFIG identity alt_domain_name $ADMIN_DOMAIN_NAME + + # Max API micro-version for tempest tests + iniset $TEMPEST_CONFIG share min_api_microversion 2.0 + iniset $TEMPEST_CONFIG share max_api_microversion 2.57 fi }