tests: pin cloud-init's pytest to <8.0.0 (#7800)

Latest pytest 8.0.0 release had breaking changes which broke the cloud-init tests. Pin to previous versions of pytest.

See canonical/cloud-init@7c96c9c

Signed-off-by: Chris Co chrco@microsoft.com

Author: christopherco

SPECS/cloud-init/ci-Pin-pytest-8.0.0.patch

@@ -0,0 +1,41 @@
+From 7c96c9cd9318e816ce4564b58a2c98271363c447 Mon Sep 17 00:00:00 2001
+From: Brett Holman <brett.holman@canonical.com>
+Date: Mon, 29 Jan 2024 12:03:36 -0700
+Subject: [PATCH] ci: Pin pytest<8.0.0. (#4816)
+
+The latest pytest release broke some tests in non-obvious ways. Pin
+the version for now so that CI passes.
+---
+ integration-requirements.txt | 2 +-
+ test-requirements.txt        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/integration-requirements.txt b/integration-requirements.txt
+index dc17759a..208a0c6a 100644
+--- a/integration-requirements.txt
++++ b/integration-requirements.txt
+@@ -7,7 +7,7 @@ pycloudlib>=5.10.0,<1!6
+ # test/unittests/conftest.py to be loaded by our integration-tests tox env
+ # resulting in an unmet dependency issue:
+ # https://github.com/pytest-dev/pytest/issues/11104
+-pytest!=7.3.2
++pytest!=7.3.2,<8.0.0
+ 
+ packaging
+ passlib
+diff --git a/test-requirements.txt b/test-requirements.txt
+index 46a98b4c..3d2480fd 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -4,7 +4,7 @@
+ # test/unittests/conftest.py to be loaded by our integration-tests tox env
+ # resulting in an unmet dependency issue:
+ # https://github.com/pytest-dev/pytest/issues/11104
+-pytest!=7.3.2
++pytest!=7.3.2,<8.0.0
+ 
+ pytest-cov
+ pytest-mock
+-- 
+2.33.8
+

SPECS/cloud-init/cloud-init.spec

@@ -1,7 +1,7 @@
 Summary:        Cloud instance init scripts
 Name:           cloud-init
 Version:        23.4.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv3
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -10,6 +10,7 @@ URL:            https://launchpad.net/cloud-init
 Source0:        https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz
 Source1:        10-azure-kvp.cfg
 Patch0:         Retain-exit-code-in-cloud-init-status-for-recoverabl.patch
+Patch1:         ci-Pin-pytest-8.0.0.patch
 %define cl_services cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
 BuildRequires:  automake
 BuildRequires:  dbus
@@ -145,6 +146,9 @@ make check %{?_smp_mflags}
 %config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/10-azure-kvp.cfg
 
 %changelog
+* Fri Feb 09 2024 Chris Co <chrco@microsoft.com> - 23.4.1-3
+- Add patch to pin pytest to <8.0.0 so cloud-init tests run correctly
+
 * Fri Jan 19 2024 Chris Co <chrco@microsoft.com> - 23.4.1-2
 - Add patch to retain exit code for recoverable errors