From nobody Fri Mar 29 00:34:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652345483; cv=none; d=zohomail.com; s=zohoarc; b=Mc+7Gaz53Oe+J0MBlVfxyifVHyxn511C2hGoDmhbdi0MCS47HzsL0d/Ijek4F0qjXsntu8YJE2Pe/NMEM7x+isUsN8tBDr6c7Ae21KZlZoU3ZTQs3Ryuqr2rGdKxOPLjrF3K14spYix/KK3KUPTrf41CwVlfeKcy+Il+r6xox+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652345483; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=V1OQmbDxDUbuDyl+fIeCxOnvhlqtQ2paprVgM3Brx48=; b=cJ6+5prr00TXauyp5Z6Efi+3o0NqxLgpKKIivqT/0/q8MrvDVjOsmpQ8hr3tKAT3Zt6yTkcgVKIkd+vzfV+LMCJJ+2oOLsIPkkzOhcAr/7Yk6UNk8g06hW0oKR4yRt4V+aMm7jytmhh/liQXI20pibcyvdR4wVmXSSdcjUs4nis= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 16523454830231003.4932630625938; Thu, 12 May 2022 01:51:23 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-391-_80ZQrR-NP-hGg2NBleICQ-1; Thu, 12 May 2022 04:51:19 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F3FFD811E90; Thu, 12 May 2022 08:51:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AAB35400E87B; Thu, 12 May 2022 08:51:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7B16C193220D; Thu, 12 May 2022 08:51:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1D23E1932228 for ; Thu, 12 May 2022 08:51:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 11323112131E; Thu, 12 May 2022 08:51:16 +0000 (UTC) Received: from nautilus.redhat.com (unknown [10.40.193.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83EFA1121319; Thu, 12 May 2022 08:51:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652345482; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=V1OQmbDxDUbuDyl+fIeCxOnvhlqtQ2paprVgM3Brx48=; b=QO1FH3xNR+hhu/QYZxaa6nkM6JxeB4pNhobyKRleMLYigZ6QQHxY8dJ/BfIfURhPhnE1X5 vO2OZw2N9KS3BC6Gj9l4XyzaOACDqDqmz0VoVBkZTX1m6G55pAz9tKSoCgkZkCBd2EJ07s I1IZCTqoEH58KUV7ump6Eh6UHRjxTwU= X-MC-Unique: _80ZQrR-NP-hGg2NBleICQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 4/5] ci: Add a new integration job template for the upstream QEMU scenario Date: Thu, 12 May 2022 10:50:58 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: eskultet@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652345483422100007 YAML anchors don't work with Shell condition structures, so we cannot simply reference the QEMU build template YAML anchor conditionally and hence have everything as part of a single job template. Instead, we have to "subclass" the .integration_tests template and inject the QEMU building bits explicitly. Signed-off-by: Erik Skultety Reviewed-by: Michal Privoznik Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/integration-template.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 89fc3f0bae..e2ccebd1f6 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -87,3 +87,14 @@ - if: '$LIBVIRT_CI_INTEGRATION' when: on_success - when: never + + +# YAML anchors don't work with Shell conditions so we can't use a variable +# to conditionally build+install QEMU from source. +# Instead, create a new test job template for this scenario. +.integration_tests_upstream_qemu: + extends: .integration_tests + before_script: + - !reference [.integration_tests, before_script] + - cd "$SCRATCH_DIR" + - *qemu-build-template --=20 2.34.3