Disable QoS scenario tests differently

The test was disabled due to some issues in the reference implementation.
CIs for other implementations might not want to disable it.

Closes-Bug: #1689238
Related-Bug: #1662109
Change-Id: I36357e2ef967db3a73c2341903cd18f5109a006b

neutron/tests/contrib/gate_hook.sh

@@ -104,6 +104,8 @@ case $VENV in
     load_conf_hook osprofiler
     if [[ "$VENV" =~ "dsvm-scenario" ]]; then
         load_rc_hook ubuntu_image
+        # bug/1662109
+        export DEVSTACK_GATE_TEMPEST_REGEX="^(?!.*(?:neutron\.tests\.tempest\.scenario\.test_qos.*))^neutron\.tests\.tempest\.scenario\."
     fi
     if [[ "$VENV" =~ "dsvm-scenario-linuxbridge" ]]; then
         load_conf_hook iptables_verify

neutron/tests/tempest/scenario/test_qos.py

@@ -20,7 +20,6 @@ from oslo_log import log as logging
 from tempest.lib import decorators
 from tempest.lib import exceptions
 from tempest import test
-import testtools
 
 from neutron.common import utils
 from neutron.services.qos import qos_consts
@@ -83,7 +82,6 @@ class QoSTest(base.BaseTempestTestCase):
     @classmethod
     @test.requires_ext(extension="qos", service="network")
     @base_api.require_qos_rule_type(qos_consts.RULE_TYPE_BANDWIDTH_LIMIT)
-    @testtools.skip('bug/1662109')
     def resource_setup(cls):
         super(QoSTest, cls).resource_setup()