Merge "Allocation API: functional tests"
diff --git a/ironic_tempest_plugin/services/introspection_client.py b/ironic_tempest_plugin/services/introspection_client.py
index 3b1a75b..f82aed6 100644
--- a/ironic_tempest_plugin/services/introspection_client.py
+++ b/ironic_tempest_plugin/services/introspection_client.py
@@ -17,13 +17,14 @@
CONF = config.CONF
-ADMIN_CREDS = common_creds.get_configured_admin_credentials()
class Manager(clients.Manager):
def __init__(self,
- credentials=ADMIN_CREDS,
+ credentials=None,
api_microversions=None):
+ if not credentials:
+ credentials = common_creds.get_configured_admin_credentials()
super(Manager, self).__init__(credentials)
self.introspection_client = BaremetalIntrospectionClient(
self.auth_provider,
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index e32f918..aff85eb 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -6,21 +6,21 @@
check:
jobs:
# NOTE(dtantsur): keep N-3 and older non-voting for these jobs.
- - ironic-dsvm-standalone
+ - ironic-standalone
- ironic-dsvm-standalone-rocky
- ironic-dsvm-standalone-queens
- ironic-dsvm-standalone-pike:
voting: false
- - ironic-tempest-dsvm-functional-python3
+ - ironic-tempest-functional-python3
- ironic-tempest-dsvm-functional-python3-rocky
- - ironic-tempest-dsvm-ironic-inspector
+ - ironic-inspector-tempest
- ironic-tempest-dsvm-ironic-inspector-rocky
- ironic-tempest-dsvm-ironic-inspector-queens
- ironic-tempest-dsvm-ironic-inspector-pike:
voting: false
# NOTE(dtantsur): these jobs cover rarely changed tests and are quite
# unstable, so keep them non-voting on stable branches.
- - ironic-tempest-dsvm-ipa-wholedisk-direct-tinyipa-multinode
+ - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
- ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-rocky:
voting: false
- ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-queens:
@@ -37,13 +37,13 @@
gate:
queue: ironic
jobs:
- - ironic-dsvm-standalone
+ - ironic-standalone
- ironic-dsvm-standalone-rocky
- ironic-dsvm-standalone-queens
- - ironic-tempest-dsvm-functional-python3
+ - ironic-tempest-functional-python3
- ironic-tempest-dsvm-functional-python3-rocky
- - ironic-tempest-dsvm-ironic-inspector
+ - ironic-inspector-tempest
- ironic-tempest-dsvm-ironic-inspector-rocky
- ironic-tempest-dsvm-ironic-inspector-queens
- - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
+ - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
- ironic-inspector-tempest-dsvm-discovery
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index 4413ba7..c25865a 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -1,52 +1,52 @@
---
- job:
name: ironic-dsvm-standalone-rocky
- parent: ironic-dsvm-standalone
+ parent: ironic-standalone
override-checkout: stable/rocky
- job:
name: ironic-dsvm-standalone-queens
- parent: ironic-dsvm-standalone
+ parent: ironic-standalone
override-checkout: stable/queens
- job:
name: ironic-dsvm-standalone-pike
- parent: ironic-dsvm-standalone
+ parent: ironic-standalone
override-checkout: stable/pike
- job:
name: ironic-tempest-dsvm-functional-python3-rocky
- parent: ironic-tempest-dsvm-functional-python3
+ parent: ironic-tempest-functional-python3
override-checkout: stable/rocky
- job:
name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-rocky
- parent: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
+ parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
override-checkout: stable/rocky
- job:
name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-queens
- parent: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
+ parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
override-checkout: stable/queens
- job:
name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-pike
- parent: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
+ parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
override-checkout: stable/pike
- job:
name: ironic-tempest-dsvm-ironic-inspector-rocky
- parent: ironic-tempest-dsvm-ironic-inspector
+ parent: ironic-inspector-tempest
override-checkout: stable/rocky
- job:
name: ironic-tempest-dsvm-ironic-inspector-queens
- parent: ironic-tempest-dsvm-ironic-inspector
+ parent: ironic-inspector-tempest
override-checkout: stable/queens
- job:
name: ironic-tempest-dsvm-ironic-inspector-pike
- parent: ironic-tempest-dsvm-ironic-inspector
+ parent: ironic-inspector-tempest
override-checkout: stable/pike
- job: