From 3c1b0f1b9b848503dd9d6b984523ff6f287532d2 Mon Sep 17 00:00:00 2001
From: Sofer Athlan-Guyot <sathlang@redhat.com>
Date: Mon, 28 Nov 2022 15:24:49 +0100
Subject: [PATCH] [Wallaby only] Adding the multi-rhel job.

This add tripleo multi-rhel job to Wallaby testing.

Wallaby only as it's the only place where this multi-rhel state can
happen.

We add it to tripleo-upgrade where we will need that coverage in order
to ensure we adjust the command for successful multi-rhel update.

Depends-On: https://review.opendev.org/c/openstack/tripleo-ci/+/865851
Change-Id: I1384d3c6f290b109a10399c96680349af126dcd8
---
 templates/overcloud_update_prepare.sh.j2 | 4 ++++
 zuul.d/layout.yaml                       | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/templates/overcloud_update_prepare.sh.j2 b/templates/overcloud_update_prepare.sh.j2
index 2ce828e1..201cfa78 100644
--- a/templates/overcloud_update_prepare.sh.j2
+++ b/templates/overcloud_update_prepare.sh.j2
@@ -46,6 +46,10 @@ openstack overcloud update prepare ${PREPARE_ANSWER} \
     {% if config_heat_extra_yaml is defined -%}
     -e {{ working_dir }}/{{ install.deployment.files | basename }}/config_heat_extra.yaml \
     {% endif -%}
+    {% if mixed_os|default(false)|bool -%}
+    --disable-protected-resource-types \
+    --baremetal-deployment  \
+    {% endif -%}
     {% if rhsm_overcloud_env != '' -%}
     {# adding rhsm at the end so it overrides any other rhsm params passed. -#}
     -e /usr/share/openstack-tripleo-heat-templates/environments/rhsm.yaml \
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 9c13754a..415f5a63 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -11,6 +11,7 @@
               - tripleo-upgrade-centos-8-molecule
         - openstack-tox-linters
         - tripleo-tox-molecule
+        - tripleo-ci-centos-8-content-provider: *content_provider_deps
         - tripleo-upgrade-centos-8-molecule:
             dependencies:
               - tripleo-tox-molecule
@@ -51,7 +52,12 @@
                 - build
             dependencies:
               - tripleo-ci-centos-9-content-provider
-
+        - tripleo-ci-centos-8-9-multinode-mixed-os-update:
+            irrelevant-files: *multinode_ignored
+            vars: *multi_consumer_vars
+            dependencies:
+              - tripleo-ci-centos-9-content-provider
+              - tripleo-ci-centos-8-content-provider
     gate:
       jobs:
         - openstack-tox-linters