gnocchi: fix functional tests on master
The change does not work as
expected, an old rule override the new one.
This changes fixes that.
@@ -3492,10 +3492,6 @@ jobs:
- name: ^gate-gnocchi-tox-py35
branch: ^(?!stable/2\.[01])
- # After 3.1, Gnocchi run functional tests within the default pyXX target
- - name: ^gate-gnocchi-dsvm-functional-.*-ubuntu-xenial
- branch: ^(stable/(1\..|2\..|3.[01]))
-
- name: ^gate-gnocchi-tox-.+-upgrade-from-2.2-ubuntu-xenial
branch: ^stable/3\.1$
@@ -3510,10 +3506,10 @@ jobs:
- name: ^gate-gnocchi-dsvm-functional-.+-ubuntu-trusty
branch: ^(stable/2\.[01])
- # Use Ubuntu Xenial for stable/3.* and other future branches
- # (i.e. Newton and after)
+ # Use Ubuntu Xenial for stable/3.0 and stable/3.1 (i.e. Newton and Ocata)
+ # After 3.1, Gnocchi run functional tests within the default pyXX target
- name: ^gate-gnocchi-dsvm-functional-.+-ubuntu-xenial
- branch: ^(?!stable/2\.[01])
+ branch: ^(stable/3\.[01])
- name: ^gate-sahara-cli.*$
skip-if:
