From 91142cfee682093c578f8269ccec92dfdf36f382 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 13 Mar 2024 12:43:57 +0100 Subject: [PATCH] run-queue: Extend queue capability check to job-runner With job-runner, the bits that actually need /dev/kvm don't run in the "queue monitor" task container any more, but in separate containers. We want to drop importing /dev/kvm into the monitor container [1], so extend the check to also accept the presence of a job-runner configuration. With that we can drop the check for `COCKPIT_TESTMAP_INJECT` -- that was just a hack, and the cockpituous integration tests define `JOB_RUNNER_CONFIG` already. [1] https://github.com/cockpit-project/cockpituous/pull/590 --- run-queue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-queue b/run-queue index 87460f1dcb..ca51e0b85f 100755 --- a/run-queue +++ b/run-queue @@ -100,8 +100,8 @@ def consume_task_queue(channel, amqp, declare_public_result, declare_rhel_result if statistics_queue and declare_stats_result.method.message_count > 0: # statistics queue is quick to process, always do that first queue = 'statistics' - elif os.path.exists('/dev/kvm') or os.getenv('JOB_RUNNER_CONFIG') or os.getenv('COCKPIT_TESTMAP_INJECT'): - # only process test queues in capable environments: with KVM or job-runner support, or during integration tests + elif os.path.exists('/dev/kvm') or os.getenv('JOB_RUNNER_CONFIG'): + # only process test queues in capable environments: with KVM or job-runner support queue = 'public' if redhat_network(): # Try the rhel queue if the public queue is empty