From nobody Tue May 14 22:49:10 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1705054394581522.2998717195767; Fri, 12 Jan 2024 02:13:14 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 699CA1D82; Fri, 12 Jan 2024 05:13:13 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A96571CF8; Fri, 12 Jan 2024 05:11:57 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 595361CEF; Fri, 12 Jan 2024 05:11:54 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C47001C92 for ; Fri, 12 Jan 2024 05:11:53 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-14-tLtX4cGdPCSI3Pp56z4EsA-1; Fri, 12 Jan 2024 05:11:51 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A670C8A5B8C for ; Fri, 12 Jan 2024 10:11:51 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3984F1121306 for ; Fri, 12 Jan 2024 10:11:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: tLtX4cGdPCSI3Pp56z4EsA-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 1/2] ci: Fix .integration_tests_upstream_qemu Date: Fri, 12 Jan 2024 11:11:47 +0100 Message-ID: <20240112101148.703819-2-abologna@redhat.com> In-Reply-To: <20240112101148.703819-1-abologna@redhat.com> References: <20240112101148.703819-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: XXJR24VY3DQYXUCZHCZAWQMYTW6TE53R X-Message-ID-Hash: XXJR24VY3DQYXUCZHCZAWQMYTW6TE53R X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1705054395665100001 We enter $SCRATCH_DIR before going through the process of cloning QEMU's upstream repo and building it, but once we're done we don't get back to libvirt's sources, so the very next step fails with /tmp/script.: line 188: ci/jobs.sh: No such file or directory Use pushd/popd to ensure that we're back to the correct place once QEMU has been built and installed. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- ci/integration-template.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 544264c3d5..1ccf64f4c1 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -83,9 +83,10 @@ .integration_tests_upstream_qemu: before_script: - !reference [.integration_tests, before_script] - - cd "$SCRATCH_DIR" + - pushd "$SCRATCH_DIR" - *qemu-build-template - sudo restorecon -R /usr + - popd =20 .integration_tests_upstream_qemu_prebuilt_env: extends: --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Tue May 14 22:49:10 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1705054478613375.0523655277285; Fri, 12 Jan 2024 02:14:38 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6D8E21D82; Fri, 12 Jan 2024 05:14:37 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 104571D83; Fri, 12 Jan 2024 05:12:08 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id EC9A71CCB; Fri, 12 Jan 2024 05:11:54 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 65D5C1C92 for ; Fri, 12 Jan 2024 05:11:54 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-447-W0pcNp0OM2StgauMRhqJhA-1; Fri, 12 Jan 2024 05:11:52 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 639F73806173 for ; Fri, 12 Jan 2024 10:11:52 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.224.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EAB69112131D for ; Fri, 12 Jan 2024 10:11:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: W0pcNp0OM2StgauMRhqJhA-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 2/2] ci: Do more as part of .qemu-build-template Date: Fri, 12 Jan 2024 11:11:48 +0100 Message-ID: <20240112101148.703819-3-abologna@redhat.com> In-Reply-To: <20240112101148.703819-1-abologna@redhat.com> References: <20240112101148.703819-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: VJRSB3BV4GCRNMWIXX3XNYIKMV6ZBLB7 X-Message-ID-Hash: VJRSB3BV4GCRNMWIXX3XNYIKMV6ZBLB7 X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1705054480056100001 Entering $SCRATCH_DIR, going back to the original directory and setting SELinux labels for the newly-installed QEMU binaries are all steps that logically belong to this template rather than its callers. Signed-off-by: Andrea Bolognani Reviewed-by: Michal Privoznik --- ci/integration-template.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 1ccf64f4c1..166445527c 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -1,4 +1,5 @@ .qemu-build-template: &qemu-build-template + - pushd "$SCRATCH_DIR" - git clone --depth 1 https://gitlab.com/qemu-project/qemu.git - cd qemu # @@ -22,6 +23,8 @@ # other user - sudo git config --global --add safe.directory "$SCRATCH_DIR/qemu" - sudo make install + - sudo restorecon -R /usr + - popd =20 =20 .collect-logs: &collect-logs @@ -83,10 +86,7 @@ .integration_tests_upstream_qemu: before_script: - !reference [.integration_tests, before_script] - - pushd "$SCRATCH_DIR" - *qemu-build-template - - sudo restorecon -R /usr - - popd =20 .integration_tests_upstream_qemu_prebuilt_env: extends: --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org