CI: Additional minor job changes to improve CI reliability

Automated cleaning makes sense to test and ensure working in
more complex and focused scenarios, but realistically we don't
need to run additional integration testing when it is such a core
component of ironic's behavior.

Also marked the ironic-tempest-ipa-partition-uefi-pxe_ipmitool
job as non-voting. By default it is trying to run with 4GB VMs
which means it was always running the risk of being over comitted
once we introduced the second VM even if it is never started.

Also reduces the size of the UEFI VM RAM as the latest ussuri
ramdisks are now smaller due to the additional cleanup added in
IPA-B. This now matches master branch large VM default.

Also increases general swap size to 4GB so hopefully we can at
least maybe have a semi-funcitonal gate.

Change-Id: I57f36631408f35275eb450e9a28f9c766f4be9b8

2 files changed, 13 insertions, 4 deletions

diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 3e848da12..35f2c4656 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -24,6 +24,7 @@
       - ^tools/.*$
       - ^tox.ini$
     vars:
+      configure_swap_size: 4096
       tox_envlist: all
       tempest_test_regex: ironic_tempest_plugin.tests.scenario
       tempest_concurrency: 1
@@ -252,7 +253,7 @@
     vars:
       devstack_localrc:
         IRONIC_BOOT_MODE: uefi
-        IRONIC_VM_SPECS_RAM: 4096
+        IRONIC_VM_SPECS_RAM: 333096
         IRONIC_AUTOMATED_CLEAN_ENABLED: False
         IRONIC_DEFAULT_BOOT_OPTION: netboot
 
@@ -262,6 +263,7 @@
     parent: ironic-base
     timeout: 5400
     vars:
+      tempest_test_regex: test_baremetal_server_ops_partition_image
       devstack_localrc:
         IRONIC_DEFAULT_BOOT_OPTION: netboot
         IRONIC_AUTOMATED_CLEAN_ENABLED: True
@@ -573,6 +575,7 @@
     description: Ironic tempest scenario test utilizing PXE, UEFI, and Grub2
     parent: ironic-base
     vars:
+      tempest_test_regex: test_baremetal_server_ops_partition_image
       devstack_localrc:
         IRONIC_ENABLED_HARDWARE_TYPES: ipmi
         IRONIC_ENABLED_BOOT_INTERFACES: pxe
@@ -581,7 +584,7 @@
         IRONIC_RAMDISK_TYPE: tinyipa
         IRONIC_AUTOMATED_CLEAN_ENABLED: False
         IRONIC_DEFAULT_BOOT_OPTION: netboot
-        IRONIC_VM_SPECS_RAM: 4096
+        IRONIC_VM_SPECS_RAM: 3096
 
 - job:
     # Security testing for known issues
@@ -714,6 +717,7 @@
         IRONIC_VM_EPHEMERAL_DISK: 0
         SWIFT_ENABLE_TEMPURLS: True
         SWIFT_TEMPURL_KEY: secretkey
+        IRONIC_AUTOMATED_CLEAN_ENABLED: False
       devstack_services:
         s-account: True
         s-container: True
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index bd719ed18..fe3363c12 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -19,7 +19,11 @@
         - ironic-tempest-partition-bios-redfish-pxe
         - ironic-tempest-partition-uefi-redfish-vmedia
         - ironic-tempest-ipa-partition-pxe_ipmitool
-        - ironic-tempest-ipa-partition-uefi-pxe_ipmitool
+          # NOTE(TheJulia): Marking non-voting as CI memory changes
+          # means this job is unlikely to work without changing the base
+          # ramdisk OS.
+        - ironic-tempest-ipa-partition-uefi-pxe_ipmitool:
+            voting: false
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-indirect
@@ -58,7 +62,8 @@
         - ironic-tempest-partition-bios-redfish-pxe
         - ironic-tempest-partition-uefi-redfish-vmedia
         - ironic-tempest-ipa-partition-pxe_ipmitool
-        - ironic-tempest-ipa-partition-uefi-pxe_ipmitool
+        # Removing from voting due to memory consumption
+        # - ironic-tempest-ipa-partition-uefi-pxe_ipmitool
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-indirect