From b13e944bc2debf7925a5e91672cacd665ef0b4ba Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Fri, 9 Aug 2024 15:54:58 +0300 Subject: [PATCH 1/3] test: Continue to use "eth1" on rhel-10-0 The "eth1" interface has a altname of "ens15" on rhel-10-0, but we still have to use eth1 to configure the initrd. *shrug* --- test/verify/check-storage-luks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/verify/check-storage-luks b/test/verify/check-storage-luks index a1e04936020..e8790e19378 100755 --- a/test/verify/check-storage-luks +++ b/test/verify/check-storage-luks @@ -775,7 +775,7 @@ class TestStorageNBDE(storagelib.StorageCase, packagelib.PackageCase): # Tell the initrd to configure our special inter-machine # network that has the "tang" machine. # - iface = "ens15" if m.image.startswith(("centos-10", "rhel-10")) else "eth1" + iface = "ens15" if m.image in ["centos-10"] else "eth1" m.execute(f"grubby --update-kernel=ALL --args='ip=10.111.112.1::10.111.112.1:255.255.255.0::{iface}:off'") try: From ae017d4788535dcb97f4073a95fd9c0cd20c2693 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Fri, 9 Aug 2024 16:28:41 +0300 Subject: [PATCH 2/3] storage: Allow Stratis on-demand installation on rhel-10 --- pkg/storaged/manifest.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/storaged/manifest.json b/pkg/storaged/manifest.json index 8ee17324b82..e03ed9d7166 100644 --- a/pkg/storaged/manifest.json +++ b/pkg/storaged/manifest.json @@ -64,7 +64,8 @@ "stratis_package": { "fedora": "stratisd", "centos": "stratisd", "arch": "stratisd", - "platform:el9": "stratisd" + "platform:el9": "stratisd", + "platform:el10": "stratisd" }, "nbde_root_help": { "fedora": true, "centos": true, From 8f739d9768c66600333c0843a4b920428c0062a0 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Fri, 9 Aug 2024 18:16:05 +0300 Subject: [PATCH 3/3] test: Explicitly set mock-insights purpose to CLIENT_AUTH Otherwise connections to it will silently fail. Hurray! --- test/verify/files/mock-insights | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/verify/files/mock-insights b/test/verify/files/mock-insights index ce7dedfa205..0112a9f537b 100755 --- a/test/verify/files/mock-insights +++ b/test/verify/files/mock-insights @@ -210,7 +210,7 @@ def insights_server(port): subprocess.check_call(["sscg"], cwd=certdir) httpd = HTTPServer(('', port), handler) - ctx = ssl.create_default_context() + ctx = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH) ctx.check_hostname = False ctx.verify_mode = ssl.CERT_OPTIONAL # with newer Pythons this is ctx.minimum_version = ssl.TLSVersion.TLSv1_2