Merge "Use get_service_clients framework with basic Secure RBAC"
diff --git a/tox.ini b/tox.ini
index 65b5243..032d6b7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-minversion = 3.9.0
+minversion = 3.18.0
envlist = pep8
skipsdist = True
ignore_basepython_conflict=true
@@ -41,7 +41,7 @@
[testenv:pdf-docs]
deps = {[testenv:docs]deps}
-whitelist_externals = make
+allowlist_externals = make
commands = sphinx-build -b latex doc/source doc/build/pdf
make -C doc/build/pdf
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ac8a825..57bfcea 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,54 +7,55 @@
jobs:
# NOTE(dtantsur): keep N-3 and older non-voting for these jobs.
- ironic-standalone
+ - ironic-standalone-wallaby
- ironic-standalone-victoria
- - ironic-standalone-ussuri
- - ironic-standalone-train:
+ - ironic-standalone-ussuri:
voting: false
- ironic-tempest-functional-python3
+ - ironic-tempest-functional-python3-wallaby
- ironic-tempest-functional-python3-victoria
- - ironic-tempest-functional-python3-ussuri
- - ironic-tempest-functional-python3-train:
+ - ironic-tempest-functional-python3-ussuri:
voting: false
- ironic-inspector-tempest
+ - ironic-inspector-tempest-wallaby
- ironic-inspector-tempest-victoria
- - ironic-inspector-tempest-ussuri
- - ironic-inspector-tempest-train:
+ - ironic-inspector-tempest-ussuri:
voting: false
- ironic-standalone-redfish
+ - ironic-standalone-redfish-wallaby:
+ voting: false
- ironic-standalone-redfish-victoria:
voting: false
- ironic-standalone-redfish-ussuri:
voting: false
- - ironic-standalone-redfish-train:
- voting: false
# NOTE(dtantsur): these jobs cover rarely changed tests and are quite
# unstable, so keep them non-voting.
- ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode:
voting: false
+ - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-wallaby:
+ voting: false
- ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-victoria:
voting: false
- ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-ussuri:
voting: false
- - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-train:
- voting: false
- ironic-inspector-tempest-discovery
+ - ironic-inspector-tempest-discovery-wallaby:
+ voting: false
- ironic-inspector-tempest-discovery-victoria:
voting: false
- ironic-inspector-tempest-discovery-ussuri:
voting: false
- - ironic-inspector-tempest-discovery-train:
- voting: false
gate:
queue: ironic
jobs:
- ironic-standalone
+ - ironic-standalone-wallaby
- ironic-standalone-victoria
- - ironic-standalone-ussuri
- ironic-tempest-functional-python3
+ - ironic-tempest-functional-python3-wallaby
- ironic-tempest-functional-python3-victoria
- - ironic-tempest-functional-python3-ussuri
- ironic-inspector-tempest
+ - ironic-inspector-tempest-wallaby
- ironic-inspector-tempest-victoria
- ironic-inspector-tempest-ussuri
- ironic-standalone-redfish
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index ee0e524..7e0fb52 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -1,4 +1,9 @@
- job:
+ name: ironic-standalone-wallaby
+ parent: ironic-standalone
+ override-checkout: stable/wallaby
+
+- job:
name: ironic-standalone-victoria
parent: ironic-standalone
override-checkout: stable/victoria
@@ -17,6 +22,12 @@
USE_PYTHON3: True
- job:
+ name: ironic-standalone-redfish-wallaby
+ parent: ironic-standalone-redfish
+ nodeset: openstack-single-node-focal
+ override-checkout: stable/wallaby
+
+- job:
name: ironic-standalone-redfish-victoria
parent: ironic-standalone-redfish
nodeset: openstack-single-node-focal
@@ -36,6 +47,11 @@
USE_PYTHON3: True
- job:
+ name: ironic-tempest-functional-python3-wallaby
+ parent: ironic-tempest-functional-python3
+ override-checkout: stable/wallaby
+
+- job:
name: ironic-tempest-functional-python3-victoria
parent: ironic-tempest-functional-python3
override-checkout: stable/victoria
@@ -51,6 +67,11 @@
override-checkout: stable/train
- job:
+ name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-wallaby
+ parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
+ override-checkout: stable/wallaby
+
+- job:
name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-victoria
parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
override-checkout: stable/victoria
@@ -69,6 +90,15 @@
USE_PYTHON3: True
- job:
+ name: ironic-inspector-tempest-wallaby
+ parent: ironic-inspector-tempest
+ override-checkout: stable/wallaby
+ vars:
+ devstack_localrc:
+ FIXED_NETWORK_SIZE: 4096
+ EBTABLES_RACE_FIX: True
+
+- job:
name: ironic-inspector-tempest-victoria
parent: ironic-inspector-tempest
override-checkout: stable/victoria
@@ -97,6 +127,11 @@
USE_PYTHON3: True
- job:
+ name: ironic-inspector-tempest-discovery-wallaby
+ parent: ironic-inspector-tempest-discovery
+ override-checkout: stable/wallaby
+
+- job:
name: ironic-inspector-tempest-discovery-victoria
parent: ironic-inspector-tempest-discovery
override-checkout: stable/victoria