From 9df7e67e696d560acadf924db3fa018695bbdf1c Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Thu, 31 Mar 2022 16:18:28 -0700
Subject: [PATCH] Grenade: Change to use bios because we have funky networking

Grenade, for some confusing reason, creates a separate network,
and uses that for upgrade testing as opposed to the original network
the VMs were bound to. If Julia's memory is correct, this was for
multinode upgrade testing.

Anyway, When in UEFI mode, it appears that the TFTP packets
don't get tracked nor cross the boundrary. We likley need to
explicitly address this, but first, lets get the job working as
it was and can then update it.

Also, update requirements because markupsafe removed soft_unicode
method taht was deprecated since a while. Jinja2 started using the
new soft_str method since version 3.0.0

Change-Id: Iaebe966569962b0d3d43774d57b570469479f159
---
 lower-constraints.txt   | 5 ++++-
 requirements.txt        | 2 +-
 zuul.d/ironic-jobs.yaml | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index b51252aa28..fd35cddb78 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,14 +1,17 @@
 alembic==1.4.2
 automaton==1.9.0
+Babel==2.6.0
 bandit==1.1.0
+cliff==3.3.0
 coverage==4.0
 ddt==1.2.1
+dogpile.cache==0.9.2
 eventlet==0.18.2
 fixtures==3.0.0
 futurist==1.2.0
 ironic-lib==4.6.1
 iso8601==0.1.11
-Jinja2==2.10
+Jinja2==3.0.0
 jsonpatch==1.16
 jsonschema==3.2.0
 keystoneauth1==4.2.0
diff --git a/requirements.txt b/requirements.txt
index ea11b920d0..bae599bcbe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,7 +33,7 @@ pycdlib>=1.11.0 # LGPLv2
 requests>=2.18.0 # Apache-2.0
 rfc3986>=1.2.0 # Apache-2.0
 jsonpatch!=1.20,>=1.16 # BSD
-Jinja2>=2.10 # BSD License (3 clause)
+Jinja2>=3.0.0 # BSD License (3 clause)
 keystonemiddleware>=4.17.0 # Apache-2.0
 oslo.messaging>=5.29.0 # Apache-2.0
 tenacity>=6.2.0  # Apache-2.0
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index ff7727b7a3..0271a469a1 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -831,6 +831,10 @@
     vars:
       grenade_devstack_localrc:
         shared:
+          #NOTE: when in UEFI mode, TFTP packets don't get tracked nor
+          #pass between original and upgrade networks. Switch to BIOS
+          #until we can fix this properly.
+          IRONIC_BOOT_MODE: bios
           DEFAULT_INSTANCE_TYPE: baremetal
           FORCE_CONFIG_DRIVE: True
           INSTALL_TEMPEST: False