From 1908137e12feb57a14a171fc1c1e4d70ce8a2cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 26 Jul 2023 11:09:27 +0200 Subject: [PATCH] Require QEMUCPU=host for stream 9 Otherwise the images will fail to boot as Stream 9 requires x86_64v2. Unfortunately this can still result in the failure if the worker doesn't support v2 :-/ --- launcher/constants.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/launcher/constants.py b/launcher/constants.py index 31af887..4da92d2 100644 --- a/launcher/constants.py +++ b/launcher/constants.py @@ -482,6 +482,7 @@ _CENTOS_PROJECT = "Virtualization:Appliances:Images:Testing_x86:centos" _CENTOS_8_REPO = "images_CentOS8" _CENTOS_9_REPO = "images_CentOS9" +_HOST_QEMUCPU_PARAMS = {"QEMUCPU": "host"} (CENTOS_8_TESTS, CENTOS_9_TESTS) = ( DistroTest( @@ -492,21 +493,33 @@ project=_CENTOS_PROJECT, repository=repo, package=f"test-image-live-disk-v{ver}:Disk", + extra_api_post_params=( + _HOST_QEMUCPU_PARAMS if ver == CENTOS_9_VERSION else None + ), ), ObsImagePackage.new_disk_image_package( project=_CENTOS_PROJECT, repository=repo, package=f"test-image-live-disk-v{ver}:Disk", + extra_api_post_params=( + _HOST_QEMUCPU_PARAMS if ver == CENTOS_9_VERSION else None + ), ), ObsImagePackage.new_live_iso_package( project=_CENTOS_PROJECT, repository=repo, package=f"test-image-live-disk-v{ver}:Live", + extra_api_post_params=( + _HOST_QEMUCPU_PARAMS if ver == CENTOS_9_VERSION else None + ), ), ObsImagePackage.new_disk_image_package( project=_CENTOS_PROJECT, repository=repo, package=f"test-image-live-disk-v{ver}:Virtual", + extra_api_post_params=( + _HOST_QEMUCPU_PARAMS if ver == CENTOS_9_VERSION else None + ), ), ], )