Fix stable/victoria gate

This patch combines a couple of separate backports:

Fix Barbican gate

This patch fixes a zuul syntax error due to a deprecated definition that
was still in use in our configuration.

(cherry picked from commit d9443a7f03)

Victoria-only: Remove TripleO job

TripleO has retired its stable/victoria, thus the job should be removed
from the branch.

We also update the integration jobs to use branched versions so we don't
test newer apis that don't exist in this branch.

Depends-On: I205e07b7f158c453d38742cde27d9834c1d618e6
Change-Id: I271a3d50dba5f1c7c58c01838fa68b4c8adbd72c
This commit is contained in:
Takashi Kajinami 2022-07-30 15:07:31 +09:00 committed by Douglas Mendizábal
parent 6b7fb6631e
commit 649b7db73a
2 changed files with 5 additions and 13 deletions

View File

@ -74,6 +74,7 @@
- openstack/python-barbicanclient
- project:
queue: barbican
templates:
- check-requirements
- openstack-cover-jobs
@ -89,20 +90,10 @@
voting: false
- barbican-grenade:
voting: false
- barbican-tempest-plugin-simple-crypto
- barbican-tempest-plugin-simple-crypto-ipv6-only
- barbican-tempest-plugin-simple-crypto-victoria
- barbican-tempest-plugin-simple-crypto-ipv6-only-victoria
- octavia-v2-dsvm-tls-barbican
# TripleO jobs that deploy Barbican.
# Note we don't use a project-template here, so it's easier
# to disable voting on one specific job if things go wrong.
# If you need any support to debug these jobs in case of
# failures, please reach us on #tripleo IRC channel.
- tripleo-ci-centos-8-scenario002-standalone:
voting: false
- tripleo-ci-centos-8-undercloud-containers:
voting: false
gate:
queue: barbican
jobs:
- barbican-tox-functional
experimental:

View File

@ -17,7 +17,8 @@ oslo.policy>=1.33.0 # Apache-2.0
oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
oslo.service!=1.28.1,>=1.24.0 # Apache-2.0
oslo.upgradecheck>=0.1.1 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
oslo.utils!=3.39.1,!=3.40.0,!=3.40.1,>3.0.0,<4.0.0;python_version<'3.6' # Apache-2.0
oslo.utils!=3.39.1,!=3.40.0,!=3.40.1,>3.0.0,<4.13.0;python_version>='3.6' # Apache-2.0
oslo.versionedobjects>=1.31.2 # Apache-2.0
Paste>=2.0.2 # MIT
PasteDeploy>=1.5.0 # MIT