commit cfac16a78c8f05ab2a893cf15ebbcdbf9b7d48fb
author Ghanshyam Mann <gmann@ghanshyammann.com> Sun Jul 26 12:48:10 2020 -0500
committer Ghanshyam Mann <gmann@ghanshyammann.com> Fri Aug 14 11:49:39 2020 +0000
tree 2df1e4128054b9ce9baf9ade267af73115314a06
parent 7a69fa081ca18eec487350a8adee6e96e1903a7d

Fix gate for multiple issues

1. To have mock installed for unit tests

unit tests jobs use tempest version released in pypi
which has use of mock but in recent changed mock requirement
is removed from requirements file and it end up failing.

- https://zuul.opendev.org/t/openstack/build/c3a33c501c054db9b1eecedb7d4b2c48

Let's add mock into the requirement file to be installed for unit tests
job until we bump the min version of tempest to latest.

2. Nova policy granular work
https://review.opendev.org/#/q/topic:bp/policy-defaults-refresh-deprecated-apis+(status:open+OR+status:merged)
Adding new flag to handle the policy changed in Victoria.

Depends-On: https://review.opendev.org/#/c/745158/

Change-Id: I3683cca390b44146c217ce8600f63a9894057058

devstack/plugin.sh

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 9daf285..32c6562 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -47,6 +47,7 @@
        # TODO(rb560u): Remove this once stable/pike becomes EOL.
        # These policies were removed in Ussuri but are available in Pike.
        iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_ussuri False
+       iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_victoria False
     fi
 
     if [[ ${DEVSTACK_SERIES} == 'queens' ]]; then
@@ -74,6 +75,7 @@
        # TODO(rb560u): Remove this once stable/queens becomes EOL.
        # These policies were removed in Ussuri but are available in Queens.
        iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_ussuri False
+       iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_victoria False
     fi
 
     if [[ ${DEVSTACK_SERIES} == 'rocky' ]]; then
@@ -91,6 +93,7 @@
        # TODO(rb560u): Remove this once stable/rocky becomes EOL.
        # These policies were removed in Ussuri but are available in Rocky.
        iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_ussuri False
+       iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_victoria False
     fi
 
     if [[ ${DEVSTACK_SERIES} == 'stein' ]]; then
@@ -103,11 +106,18 @@
        # TODO(rb560u): Remove this once stable/stein becomes EOL.
        # These policies were removed in Ussuri but are available in Stein.
        iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_ussuri False
+       iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_victoria False
     fi
 
     if [[ ${DEVSTACK_SERIES} == 'train' ]]; then
        # Remove this once stable/train becomes EOL.
        iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_ussuri False
+       iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_victoria False
+    fi
+
+    if [[ ${DEVSTACK_SERIES} == 'ussuri' ]]; then
+       # Remove this once stable/ussuri becomes EOL.
+       iniset $TEMPEST_CONFIG policy-feature-enabled changed_nova_policies_victoria False
     fi
 
     iniset $TEMPEST_CONFIG patrole rbac_test_roles $RBAC_TEST_ROLES