diff options
author | Riccardo Pittau <elfosardo@gmail.com> | 2020-10-29 11:49:42 +0100 |
---|---|---|
committer | Riccardo Pittau <elfosardo@gmail.com> | 2021-01-05 14:57:13 +0100 |
commit | c6c1525f6f2799ee781425bf4c36326f44d4bd1f (patch) | |
tree | f086daca656740007197022711f262d760f46d93 | |
parent | 4ae5375c0a2a33231c0fc1a91291975f17732c40 (diff) | |
download | ironic-c6c1525f6f2799ee781425bf4c36326f44d4bd1f.tar.gz |
Convert last bionic jobs to focal
And disable dstat in ironic-base for the time being.
Also temporary making ironic-tempest-partition-uefi-redfish-vmedia
non-voting to prevent chicken-egg effect.
Should be fixed by https://review.opendev.org/c/openstack/ironic/+/769194
Change-Id: Ib05a952260d027f9f1307a9948ac5691b57e96d3
(cherry picked from commit 1ab192beca8b3e10cefeef6c3d2343200d7bca32)
-rw-r--r-- | zuul.d/ironic-jobs.yaml | 25 | ||||
-rw-r--r-- | zuul.d/project.yaml | 7 |
2 files changed, 8 insertions, 24 deletions
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index d9454f044..c1f0d3871 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -52,12 +52,10 @@ # each of them. For don't need all 10 GiB for CirrOS anyway. IRONIC_VM_SPECS_DISK: 4 IRONIC_VM_SPECS_CPU: 2 - Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch SERVICE_TIMEOUT: 90 - devstack_plugins: ironic: https://opendev.org/openstack/ironic tempest_plugins: @@ -66,6 +64,9 @@ '{{ devstack_base_dir }}/ironic-bm-logs': 'logs' '{{ devstack_base_dir }}/data/networking-generic-switch/netmiko_session.log': 'logs' devstack_services: + # TODO: re-enable dstat once https://storyboard.openstack.org/#!/story/2008185 + # is resolved + dstat: false q-agt: true q-dhcp: true q-l3: true @@ -75,13 +76,11 @@ ovn-controller: false ovn-northd: false q-ovn-metadata-agent: false - c-api: False c-bak: False c-sch: False c-vol: False cinder: False - s-account: False s-container: False s-object: False @@ -221,12 +220,6 @@ name: ironic-tempest-partition-uefi-redfish-vmedia description: "Deploy ironic node over Redfish virtual media using UEFI boot mode" parent: ironic-tempest-partition-bios-redfish-pxe - # TODO: Remove the below nodeset setting to Bionic once - # https://storyboard.openstack.org/#!/story/2008185 is fixed - # Once nodeset is removed form here then devstack base jobs - # will automatically run this job on Ubuntu Focal nodeset from - # Victoria gate onwards. - nodeset: openstack-single-node-bionic vars: devstack_localrc: IRONIC_BOOT_MODE: uefi @@ -328,12 +321,6 @@ name: ironic-tempest-ipa-partition-pxe_ipmitool description: ironic-tempest-ipa-partition-pxe_ipmitool that also tests cleaning. parent: ironic-base - # TODO: Remove the below nodeset setting to Bionic once - # https://storyboard.openstack.org/#!/story/2008185 is fixed - # Once nodeset is removed form here then devstack base jobs - # will automatically run this job on Ubuntu Focal nodeset from - # Victoria gate onwards. - nodeset: openstack-single-node-bionic vars: devstack_localrc: IRONIC_DEFAULT_BOOT_OPTION: netboot @@ -734,12 +721,6 @@ name: ironic-tempest-bios-ipmi-direct-tinyipa description: ironic-tempest-wholedisk-bios-ipmi-direct-tinyipa that also tests cleaning. parent: ironic-base - # TODO: Remove the below nodeset setting to Bionic once - # https://storyboard.openstack.org/#!/story/2008185 is fixed - # Once nodeset is removed form here then devstack base jobs - # will automatically run this job on Ubuntu Focal nodeset from - # Victoria gate onwards. - nodeset: openstack-single-node-bionic vars: devstack_localrc: IRONIC_DEFAULT_RESCUE_INTERFACE: agent diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 2c6c203b9..fae6c080a 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -14,7 +14,9 @@ - ironic-tempest-functional-python3 - ironic-grenade - ironic-tempest-partition-bios-redfish-pxe - - ironic-tempest-partition-uefi-redfish-vmedia + # (rpittau) disabling to prevent chicken-egg effect until fixed + - ironic-tempest-partition-uefi-redfish-vmedia: + voting: false - ironic-tempest-wholedisk-bios-snmp-pxe - ironic-tempest-ipa-partition-pxe_ipmitool - ironic-tempest-ipa-partition-uefi-pxe_ipmitool @@ -49,7 +51,8 @@ - ironic-tempest-functional-python3 - ironic-grenade - ironic-tempest-partition-bios-redfish-pxe - - ironic-tempest-partition-uefi-redfish-vmedia + # (rpittau) disabling to prevent chicken-egg effect until fixed + #- ironic-tempest-partition-uefi-redfish-vmedia - ironic-tempest-wholedisk-bios-snmp-pxe - ironic-tempest-ipa-partition-pxe_ipmitool - ironic-tempest-ipa-partition-uefi-pxe_ipmitool |