From patchwork Wed Jul 27 16:36:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Mateus Martins Araujo e Castro X-Patchwork-Id: 12930568 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1E9C9C19F2B for ; Wed, 27 Jul 2022 16:42:33 +0000 (UTC) Received: from localhost ([::1]:48890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGk7D-0007DD-S0 for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 12:42:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGk1j-0003rt-RS; Wed, 27 Jul 2022 12:36:51 -0400 Received: from [200.168.210.66] (port=61870 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGk1h-0007pB-2t; Wed, 27 Jul 2022 12:36:50 -0400 Received: from p9ibm ([10.10.71.235]) by outlook.eldorado.org.br over TLS secured channel with Microsoft SMTPSVC(8.5.9600.16384); Wed, 27 Jul 2022 13:36:38 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by p9ibm (Postfix) with ESMTP id C6EC7800358; Wed, 27 Jul 2022 13:36:37 -0300 (-03) From: "Lucas Mateus Castro(alqotel)" To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: "Lucas Mateus Castro(alqotel)" , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Willian Rampazzo Subject: [PATCH 1/8] tests/docker: Fix alpine dockerfile Date: Wed, 27 Jul 2022 13:36:25 -0300 Message-Id: <20220727163632.59806-2-lucas.araujo@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> References: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> MIME-Version: 1.0 X-OriginalArrivalTime: 27 Jul 2022 16:36:38.0079 (UTC) FILETIME=[0AED3CF0:01D8A1D7] X-Host-Lookup-Failed: Reverse DNS lookup failed for 200.168.210.66 (failed) Received-SPF: pass client-ip=200.168.210.66; envelope-from=lucas.araujo@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Currently the run script uses 'readlink -e' but the image only has the busybox readlink, this commit add the coreutils package which contains the readlink with the '-e' option. Signed-off-by: Lucas Mateus Castro(alqotel) --- tests/docker/dockerfiles/alpine.docker | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 3f4c0f95cb..2943a99730 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -21,6 +21,7 @@ RUN apk update && \ cdrkit \ ceph-dev \ clang \ + coreutils \ ctags \ curl-dev \ cyrus-sasl-dev \ From patchwork Wed Jul 27 16:36:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Mateus Martins Araujo e Castro X-Patchwork-Id: 12930587 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 26F56C04A68 for ; Wed, 27 Jul 2022 16:55:47 +0000 (UTC) Received: from localhost ([::1]:57692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGkK1-0005Lu-Nr for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 12:55:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGk1m-0003sv-AI; Wed, 27 Jul 2022 12:36:55 -0400 Received: from [200.168.210.66] (port=61870 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGk1k-0007pB-Vi; Wed, 27 Jul 2022 12:36:54 -0400 Received: from p9ibm ([10.10.71.235]) by outlook.eldorado.org.br over TLS secured channel with Microsoft SMTPSVC(8.5.9600.16384); Wed, 27 Jul 2022 13:36:38 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by p9ibm (Postfix) with ESMTP id 0370E800058; Wed, 27 Jul 2022 13:36:38 -0300 (-03) From: "Lucas Mateus Castro(alqotel)" To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: "Lucas Mateus Castro(alqotel)" , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Willian Rampazzo Subject: [PATCH 2/8] scripts/ci/setup: ninja missing from build-environment Date: Wed, 27 Jul 2022 13:36:26 -0300 Message-Id: <20220727163632.59806-3-lucas.araujo@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> References: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> MIME-Version: 1.0 X-OriginalArrivalTime: 27 Jul 2022 16:36:38.0235 (UTC) FILETIME=[0B050AB0:01D8A1D7] X-Host-Lookup-Failed: Reverse DNS lookup failed for 200.168.210.66 (failed) Received-SPF: pass client-ip=200.168.210.66; envelope-from=lucas.araujo@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" ninja-build is missing from the RHEL environment, so a system prepared with that script would still fail to compile QEMU. Tested on a Fedora 36 Signed-off-by: Lucas Mateus Castro(alqotel) --- scripts/ci/setup/build-environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index 232525b91d..6df3e61d94 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -150,6 +150,7 @@ - libepoxy-devel - libgcrypt-devel - lzo-devel + - ninja-build - make - mesa-libEGL-devel - nettle-devel From patchwork Wed Jul 27 16:36:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lucas Mateus Martins Araujo e Castro X-Patchwork-Id: 12930594 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AF6E2C04A68 for ; Wed, 27 Jul 2022 16:56:46 +0000 (UTC) Received: from localhost ([::1]:59488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGkKz-0006l8-Mz for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 12:56:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGk1o-0003ur-Nq; Wed, 27 Jul 2022 12:37:01 -0400 Received: from [200.168.210.66] (port=61870 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGk1n-0007pB-Bl; Wed, 27 Jul 2022 12:36:56 -0400 Received: from p9ibm ([10.10.71.235]) by outlook.eldorado.org.br over TLS secured channel with Microsoft SMTPSVC(8.5.9600.16384); Wed, 27 Jul 2022 13:36:38 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by p9ibm (Postfix) with ESMTP id 2F331800358; Wed, 27 Jul 2022 13:36:38 -0300 (-03) From: "Lucas Mateus Castro(alqotel)" To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: "Lucas Mateus Castro(alqotel)" , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Willian Rampazzo Subject: [PATCH 3/8] scripts/ci/setup: Fix libxen requirements Date: Wed, 27 Jul 2022 13:36:27 -0300 Message-Id: <20220727163632.59806-4-lucas.araujo@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> References: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> MIME-Version: 1.0 X-OriginalArrivalTime: 27 Jul 2022 16:36:38.0438 (UTC) FILETIME=[0B240460:01D8A1D7] X-Host-Lookup-Failed: Reverse DNS lookup failed for 200.168.210.66 (failed) Received-SPF: pass client-ip=200.168.210.66; envelope-from=lucas.araujo@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" XEN hypervisor is only available in ARM and x86, but the yaml only checked if the architecture is different from s390x, changed it to a more accurate test. Tested this change on a Ubuntu 20.04 ppc64le. Signed-off-by: Lucas Mateus Castro(alqotel) Reviewed-by: Alex Bennée --- scripts/ci/setup/build-environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index 6df3e61d94..7535228685 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -97,7 +97,7 @@ state: present when: - ansible_facts['distribution'] == 'Ubuntu' - - ansible_facts['architecture'] != 's390x' + - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' - name: Install basic packages to build QEMU on Ubuntu 20.04 package: From patchwork Wed Jul 27 16:36:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Mateus Martins Araujo e Castro X-Patchwork-Id: 12930567 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 555EDC19F2C for ; Wed, 27 Jul 2022 16:42:33 +0000 (UTC) Received: from localhost ([::1]:48976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGk7E-0007Ha-0E for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 12:42:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGk1r-0003uy-Ty; Wed, 27 Jul 2022 12:37:01 -0400 Received: from [200.168.210.66] (port=61870 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGk1q-0007pB-0n; Wed, 27 Jul 2022 12:36:59 -0400 Received: from p9ibm ([10.10.71.235]) by outlook.eldorado.org.br over TLS secured channel with Microsoft SMTPSVC(8.5.9600.16384); Wed, 27 Jul 2022 13:36:38 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by p9ibm (Postfix) with ESMTP id 5C43A800058; Wed, 27 Jul 2022 13:36:38 -0300 (-03) From: "Lucas Mateus Castro(alqotel)" To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: "Lucas Mateus Castro(alqotel)" , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Willian Rampazzo Subject: [PATCH 4/8] scripts/ci/setup: spice-server only on x86 aarch64 Date: Wed, 27 Jul 2022 13:36:28 -0300 Message-Id: <20220727163632.59806-5-lucas.araujo@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> References: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> MIME-Version: 1.0 X-OriginalArrivalTime: 27 Jul 2022 16:36:38.0626 (UTC) FILETIME=[0B40B420:01D8A1D7] X-Host-Lookup-Failed: Reverse DNS lookup failed for 200.168.210.66 (failed) Received-SPF: pass client-ip=200.168.210.66; envelope-from=lucas.araujo@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Changed build-environment.yml to only install spice-server on x86_64 and aarch64 as this package is only available on those architectures. Signed-off-by: Lucas Mateus Castro(alqotel) --- scripts/ci/setup/build-environment.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index 7535228685..43cf8c759f 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -160,7 +160,6 @@ - python36 - rdma-core-devel - spice-glib-devel - - spice-server - systemtap-sdt-devel - tar - zlib-devel @@ -168,3 +167,14 @@ when: - ansible_facts['distribution_file_variety'] == 'RedHat' - ansible_facts['distribution_version'] == '8' + + - name: Install packages only available on x86 and aarch64 + dnf: + # Spice server not available in ppc64le + name: + - spice-server + state: present + when: + - ansible_facts['distribution_file_variety'] == 'RedHat' + - ansible_facts['distribution_version'] == '8' + - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' From patchwork Wed Jul 27 16:36:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Mateus Martins Araujo e Castro X-Patchwork-Id: 12930593 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E5B2CC04A68 for ; Wed, 27 Jul 2022 16:56:28 +0000 (UTC) Received: from localhost ([::1]:58706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGkKh-00068W-Gc for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 12:56:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGk1v-0003x9-5z; Wed, 27 Jul 2022 12:37:04 -0400 Received: from [200.168.210.66] (port=61870 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGk1t-0007pB-OY; Wed, 27 Jul 2022 12:37:02 -0400 Received: from p9ibm ([10.10.71.235]) by outlook.eldorado.org.br over TLS secured channel with Microsoft SMTPSVC(8.5.9600.16384); Wed, 27 Jul 2022 13:36:38 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by p9ibm (Postfix) with ESMTP id 8D06F800358; Wed, 27 Jul 2022 13:36:38 -0300 (-03) From: "Lucas Mateus Castro(alqotel)" To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: "Lucas Mateus Castro(alqotel)" , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Willian Rampazzo Subject: [PATCH 5/8] scripts/ci/setup: Add ppc64le to vars.yml template Date: Wed, 27 Jul 2022 13:36:29 -0300 Message-Id: <20220727163632.59806-6-lucas.araujo@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> References: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> MIME-Version: 1.0 X-OriginalArrivalTime: 27 Jul 2022 16:36:38.0892 (UTC) FILETIME=[0B694AC0:01D8A1D7] X-Host-Lookup-Failed: Reverse DNS lookup failed for 200.168.210.66 (failed) Received-SPF: pass client-ip=200.168.210.66; envelope-from=lucas.araujo@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Added ppc64le so that the gitlab-runner.yml could be used to set up ppc64le runners. Signed-off-by: Lucas Mateus Castro(alqotel) --- scripts/ci/setup/vars.yml.template | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci/setup/vars.yml.template b/scripts/ci/setup/vars.yml.template index e48089761f..2c84698b87 100644 --- a/scripts/ci/setup/vars.yml.template +++ b/scripts/ci/setup/vars.yml.template @@ -8,5 +8,6 @@ ansible_to_gitlab_arch: x86_64: amd64 aarch64: arm64 s390x: s390x + ppc64le: ppc64le # A unique token made available by GitLab to your project for registering runners gitlab_runner_registration_token: PLEASE_PROVIDE_A_VALID_TOKEN From patchwork Wed Jul 27 16:36:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Mateus Martins Araujo e Castro X-Patchwork-Id: 12930598 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CAD77C04A68 for ; Wed, 27 Jul 2022 17:03:32 +0000 (UTC) Received: from localhost ([::1]:38876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGkRX-00041v-M8 for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 13:03:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGk1y-00042D-Gx; Wed, 27 Jul 2022 12:37:06 -0400 Received: from [200.168.210.66] (port=61870 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGk1x-0007pB-07; Wed, 27 Jul 2022 12:37:06 -0400 Received: from p9ibm ([10.10.71.235]) by outlook.eldorado.org.br over TLS secured channel with Microsoft SMTPSVC(8.5.9600.16384); Wed, 27 Jul 2022 13:36:39 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by p9ibm (Postfix) with ESMTP id BD356800058; Wed, 27 Jul 2022 13:36:38 -0300 (-03) From: "Lucas Mateus Castro(alqotel)" To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: "Lucas Mateus Castro(alqotel)" , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Willian Rampazzo Subject: [PATCH 6/8] scripts/ci/setup: Add Fedora to build-environment.yml Date: Wed, 27 Jul 2022 13:36:30 -0300 Message-Id: <20220727163632.59806-7-lucas.araujo@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> References: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> MIME-Version: 1.0 X-OriginalArrivalTime: 27 Jul 2022 16:36:39.0063 (UTC) FILETIME=[0B836270:01D8A1D7] X-Host-Lookup-Failed: Reverse DNS lookup failed for 200.168.210.66 (failed) Received-SPF: pass client-ip=200.168.210.66; envelope-from=lucas.araujo@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Minicloud doesn't have a RHEL image, but it does have Fedora 34 and 35 images and both use DNF as package manager, so just change the ansible facts to check if it's RHEL or Fedora Signed-off-by: Lucas Mateus Castro(alqotel) --- scripts/ci/setup/build-environment.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index 43cf8c759f..a7d53d0f70 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -165,8 +165,10 @@ - zlib-devel state: present when: - - ansible_facts['distribution_file_variety'] == 'RedHat' - - ansible_facts['distribution_version'] == '8' + - | + (ansible_facts['distribution'] == 'RedHat' and + ansible_facts['distribution_version'] == '8') or + ansible_facts['distribution'] == 'Fedora' - name: Install packages only available on x86 and aarch64 dnf: @@ -175,6 +177,8 @@ - spice-server state: present when: - - ansible_facts['distribution_file_variety'] == 'RedHat' - - ansible_facts['distribution_version'] == '8' + - | + (ansible_facts['distribution'] == 'RedHat' and + ansible_facts['distribution_version'] == '8') or + ansible_facts['distribution'] == 'Fedora' - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' From patchwork Wed Jul 27 16:36:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Mateus Martins Araujo e Castro X-Patchwork-Id: 12930588 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3285EC19F28 for ; Wed, 27 Jul 2022 16:56:02 +0000 (UTC) Received: from localhost ([::1]:58590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGkKH-00062v-12 for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 12:56:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGk21-00048w-GI; Wed, 27 Jul 2022 12:37:09 -0400 Received: from [200.168.210.66] (port=61870 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGk1z-0007pB-KQ; Wed, 27 Jul 2022 12:37:08 -0400 Received: from p9ibm ([10.10.71.235]) by outlook.eldorado.org.br over TLS secured channel with Microsoft SMTPSVC(8.5.9600.16384); Wed, 27 Jul 2022 13:36:39 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by p9ibm (Postfix) with ESMTP id E8ADE800358; Wed, 27 Jul 2022 13:36:38 -0300 (-03) From: "Lucas Mateus Castro(alqotel)" To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: "Lucas Mateus Castro(alqotel)" , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Willian Rampazzo Subject: [PATCH 7/8] scripts/ci/setup: Added debian to build-environment.yml Date: Wed, 27 Jul 2022 13:36:31 -0300 Message-Id: <20220727163632.59806-8-lucas.araujo@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> References: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> MIME-Version: 1.0 X-OriginalArrivalTime: 27 Jul 2022 16:36:39.0204 (UTC) FILETIME=[0B98E640:01D8A1D7] X-Host-Lookup-Failed: Reverse DNS lookup failed for 200.168.210.66 (failed) Received-SPF: pass client-ip=200.168.210.66; envelope-from=lucas.araujo@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Minicloud has a PPC64 BE Debian11 image which can be used for the CI, so add Debian to the build-environment.yml so it can be configured with ansible-playbook. Signed-off-by: Lucas Mateus Castro(alqotel) --- scripts/ci/setup/build-environment.yml | 31 +++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index a7d53d0f70..b5d415496f 100644 --- a/scripts/ci/setup/build-environment.yml +++ b/scripts/ci/setup/build-environment.yml @@ -31,9 +31,11 @@ update_cache: yes upgrade: yes when: - - ansible_facts['distribution'] == 'Ubuntu' + - | + ansible_facts['distribution'] == 'Ubuntu' or + ansible_facts['distribution'] == 'Debian' - - name: Install basic packages to build QEMU on Ubuntu 20.04 + - name: Install basic packages to build QEMU on Ubuntu 20.04 or Debian11 package: name: - ccache @@ -56,7 +58,6 @@ - libibverbs-dev - libiscsi-dev - libjemalloc-dev - - libjpeg-turbo8-dev - liblzo2-dev - libncurses5-dev - libncursesw5-dev @@ -86,17 +87,37 @@ - sparse - xfslibs-dev state: present + when: + - | + ansible_facts['distribution'] == 'Ubuntu' or + ansible_facts['distribution'] == 'Debian' + + - name: Install Ubuntu exclusive packages to build QEMU + package: + name: + - libjpeg-turbo8-dev + state: present when: - ansible_facts['distribution'] == 'Ubuntu' - - name: Install packages to build QEMU on Ubuntu 20.04 on non-s390x + - name: Install Debian exclusive packages to build QEMU + package: + name: + - libjpeg62-turbo-dev + state: present + when: + - ansible_facts['distribution'] == 'Debian' + + - name: Install packages to build QEMU on Ubuntu 20.04 or Debian11 on non-s390x package: name: - libspice-server-dev - libxen-dev state: present when: - - ansible_facts['distribution'] == 'Ubuntu' + - | + ansible_facts['distribution'] == 'Ubuntu' or + ansible_facts['distribution'] == 'Debian' - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64' - name: Install basic packages to build QEMU on Ubuntu 20.04 From patchwork Wed Jul 27 16:36:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Mateus Martins Araujo e Castro X-Patchwork-Id: 12930600 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 27071C19F2C for ; Wed, 27 Jul 2022 17:10:14 +0000 (UTC) Received: from localhost ([::1]:44296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGkY0-00084q-Rc for qemu-devel@archiver.kernel.org; Wed, 27 Jul 2022 13:10:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGk24-0004Gq-5k; Wed, 27 Jul 2022 12:37:13 -0400 Received: from [200.168.210.66] (port=61870 helo=outlook.eldorado.org.br) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGk22-0007pB-Id; Wed, 27 Jul 2022 12:37:11 -0400 Received: from p9ibm ([10.10.71.235]) by outlook.eldorado.org.br over TLS secured channel with Microsoft SMTPSVC(8.5.9600.16384); Wed, 27 Jul 2022 13:36:39 -0300 Received: from eldorado.org.br (unknown [10.10.70.45]) by p9ibm (Postfix) with ESMTP id 22F2F800058; Wed, 27 Jul 2022 13:36:39 -0300 (-03) From: "Lucas Mateus Castro(alqotel)" To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: "Lucas Mateus Castro(alqotel)" , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Willian Rampazzo Subject: [RFC PATCH 8/8] tests/docker: Selective line reading by python script Date: Wed, 27 Jul 2022 13:36:32 -0300 Message-Id: <20220727163632.59806-9-lucas.araujo@eldorado.org.br> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> References: <20220727163632.59806-1-lucas.araujo@eldorado.org.br> MIME-Version: 1.0 X-OriginalArrivalTime: 27 Jul 2022 16:36:39.0392 (UTC) FILETIME=[0BB59600:01D8A1D7] X-Host-Lookup-Failed: Reverse DNS lookup failed for 200.168.210.66 (failed) Received-SPF: pass client-ip=200.168.210.66; envelope-from=lucas.araujo@eldorado.org.br; helo=outlook.eldorado.org.br X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, PDS_HP_HELO_NORDNS=0.659, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Building some images failed on ppc64le because the dockerfile tried to install some packages that are only available in x86 and arm64, to solve this while still having those packages be available in those architectures a comment was put before the installation command to instruct the python script into ignoring those lines for some architectures (in this case ppc64le) Overall I'm not a big fan of the way I solved this problem, so I'd like to know if anyone has a better way to make these dockerfilse work in PPC64LE. For context the base images used here are available in PPC64LE but some of the packages installed are not (in alpine's case it's XEN, which is only available to x86 and ARM), so this patch create a ignore_list which is set on a per-architecture basis, and any packages in a dockerfile in this ignore_list will not be copied to the temporary dockerfile used in the docker command. Signed-off-by: Lucas Mateus Castro(alqotel) --- tests/docker/docker.py | 15 ++++++++++++--- tests/docker/dockerfiles/alpine.docker | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index d0af2861b8..9b962d1c78 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -14,6 +14,7 @@ import os import sys import subprocess +import platform import json import hashlib import atexit @@ -207,8 +208,15 @@ def _read_qemu_dockerfile(img_name): def _dockerfile_preprocess(df): out = "" + ignore_list = [] for l in df.splitlines(): - if len(l.strip()) == 0 or l.startswith("#"): + if len(l.strip()) == 0: + continue + if l.startswith("#"): + if len(l.split()) >= 3: + if l.split()[1] == "ignore": + if platform.processor() in l.split()[2].split(','): + ignore_list += l.split()[3].split(',') continue from_pref = "FROM qemu/" if l.startswith(from_pref): @@ -219,7 +227,8 @@ def _dockerfile_preprocess(df): inlining = _read_qemu_dockerfile(l[len(from_pref):]) out += _dockerfile_preprocess(inlining) continue - out += l + "\n" + if not any(x in l.split() for x in ignore_list): + out += l + "\n" return out @@ -330,7 +339,7 @@ def build_image(self, tag, docker_dir, dockerfile, tmp_df = tempfile.NamedTemporaryFile(mode="w+t", encoding='utf-8', dir=docker_dir, suffix=".docker") - tmp_df.write(dockerfile) + tmp_df.write(_dockerfile_preprocess(dockerfile)) if user: uid = os.getuid() diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 2943a99730..5cec46d8f2 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -6,6 +6,8 @@ FROM docker.io/library/alpine:edge +# Lines to by ignored when this file is read by the python script +# ignore ppc64le,ppc64 xen-dev RUN apk update && \ apk upgrade && \ apk add \