From 1ffdabed9de7a9b6de3f9c0de76e9c1f51e31964 Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Tue, 5 Sep 2023 21:40:43 -0700
Subject: [PATCH] Change snmp job to not use a focal node

tl;dr, devstack no longer supports focal, and now errors which
results in the job failing.

Also changes the snmp job to utilize the test_ramdisk_iso
feature, as *opposed* to a full deployment because iPXE
shipped with Ubuntu no longer likes to chain boot in UEFI
mode to a block device. The easiest path, is just to run
a ramdisk in that case, which also sort of mirrors what
users of the SNMP power interface *tend* to do.

Related-Bug: #2034588

Change-Id: I276885b8f0492ead8cea38fe13826123131984ea
---
 zuul.d/ironic-jobs.yaml | 23 +++++++++++++++++++----
 zuul.d/project.yaml     |  7 ++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index dc8179c353..7b9430301c 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -365,17 +365,18 @@
         s-object: True
         s-proxy: True
 
-# NOTE(rpittau): the snmp job fails on ubuntu jammy so we pin it to
-# ubuntu focal for the time being.
 - job:
-    name: ironic-tempest-wholedisk-bios-snmp-pxe
+    name: ironic-tempest-ramdisk-bios-snmp-pxe
     description: SNMP power, iPXE, OVN, no-op management and whole disk images.
     parent: ironic-base
-    nodeset: openstack-single-node-focal
     vars:
+      # NOTE(TheJulia): No reason to go much further than the network boot,
+      # Hence the use of the ramdisk test scenario as opposed to the others.
+      tempest_test_regex: test_ramdisk_iso
       devstack_localrc:
         IRONIC_ENABLED_HARDWARE_TYPES: snmp
         IRONIC_DEPLOY_DRIVER: snmp
+        IRONIC_ENABLED_DEPLOY_INTERFACES: "ramdisk"
         IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True
         IRONIC_VM_EPHEMERAL_DISK: 0
         IRONIC_AUTOMATED_CLEAN_ENABLED: False
@@ -403,6 +404,20 @@
         ovn-controller: True
         ovn-northd: True
         q-ovn-metadata-agent: True
+        n-api: False
+        n-api-meta: False
+        n-cauth: False
+        n-cond: False
+        n-cpu: False
+        n-novnc: False
+        n-obj: False
+        n-sch: False
+        nova: False
+        placement-api: False
+        s-account: False
+        s-container: False
+        s-object: False
+        s-proxy: False
 
 - job:
     name: ironic-tempest-partition-uefi-ipmi-pxe
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ea1446afa5..898aa7aef3 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -28,8 +28,7 @@
         - ironic-tempest-uefi-redfish-vmedia
         # NOTE(TheJulia): Moving to not-voting due to bug
         # https://bugs.launchpad.net/ironic/+bug/2034588
-        - ironic-tempest-wholedisk-bios-snmp-pxe:
-            voting: false
+        - ironic-tempest-ramdisk-bios-snmp-pxe
         - ironic-tempest-partition-uefi-ipmi-pxe
         # NOTE(TheJulia) Marking multinode non-voting on 20210311
         # Due to a high failure rate on limestone where the compute1
@@ -82,9 +81,7 @@
         - ironic-standalone-redfish
         - ironic-tempest-bios-redfish-pxe
         - ironic-tempest-uefi-redfish-vmedia
-        # NOTE(stevebaker): Disabled due to bug
-        # https://bugs.launchpad.net/ironic/+bug/2034588
-        # - ironic-tempest-wholedisk-bios-snmp-pxe
+        - ironic-tempest-ramdisk-bios-snmp-pxe
         - ironic-tempest-partition-uefi-ipmi-pxe
         # NOTE(TheJulia): Disabled multinode on 20210311 due to Limestone
         # seeming to be