diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-15 17:09:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-15 17:09:11 +0000 |
| commit | 9656276713baa788f1c4a1ec2e399496cd981fda (patch) | |
| tree | c81eae10f40cdcef7cb5d6056dd030e10aa5032b | |
| parent | 2d70e6e26e97cf09291cfabbc74e49d3acde119e (diff) | |
| parent | 97ceb38a725cac797f9acf2c643d76c36e7293e0 (diff) | |
| download | ironic-9656276713baa788f1c4a1ec2e399496cd981fda.tar.gz | |
Merge "CI: switch the multinode job to tempest-multinode-full-base"
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 3 | ||||
| -rw-r--r-- | zuul.d/project.yaml | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 3f8398181..489370a5b 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -414,7 +414,8 @@ - job: name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode description: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode - parent: tempest-multinode-full-py3 + parent: tempest-multinode-full-base + nodeset: openstack-two-node-focal pre-run: playbooks/ci-workarounds/pre.yaml required-projects: - openstack/ironic diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 1e72e3a6c..7b3ac2fe2 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -19,8 +19,7 @@ - ironic-tempest-wholedisk-bios-snmp-pxe - ironic-tempest-ipa-partition-pxe_ipmitool - ironic-tempest-ipa-partition-uefi-pxe_ipmitool - - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode: - voting: false + - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode - ironic-tempest-bios-ipmi-direct-tinyipa - ironic-tempest-bfv - ironic-tempest-ipa-partition-uefi-pxe-grub2 @@ -57,6 +56,7 @@ - ironic-tempest-wholedisk-bios-snmp-pxe - ironic-tempest-ipa-partition-pxe_ipmitool - ironic-tempest-ipa-partition-uefi-pxe_ipmitool + - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode - ironic-tempest-bios-ipmi-direct-tinyipa - ironic-tempest-bfv - ironic-tempest-ipa-partition-uefi-pxe-grub2 |