From patchwork Thu Jul 11 11:15:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13730466 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 2A2ACC3DA41 for ; Thu, 11 Jul 2024 11:15:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757322.1166156 (Exim 4.92) (envelope-from ) id 1sRrln-0007rW-H8; Thu, 11 Jul 2024 11:15:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757322.1166156; Thu, 11 Jul 2024 11:15:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrln-0007rP-EZ; Thu, 11 Jul 2024 11:15:27 +0000 Received: by outflank-mailman (input) for mailman id 757322; Thu, 11 Jul 2024 11:15:25 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrll-0007rD-Jq for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 11:15:25 +0000 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [2a00:1450:4864:20::62d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id de964e90-3f76-11ef-bbfb-fd08da9f4363; Thu, 11 Jul 2024 13:15:24 +0200 (CEST) Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a6265d3ba8fso93857966b.0 for ; Thu, 11 Jul 2024 04:15:24 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7ff7d5sm246386666b.142.2024.07.11.04.15.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 04:15:23 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: de964e90-3f76-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720696523; x=1721301323; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gf25M9zoO5vZznMm7cYwnz+XBjUsPdeo20Axydvsm8w=; b=Fvan6j243CBQumJCIKFhAsXIZ5XZc2Z+bsKFmxHc4Wdq5MehiHeWWfjpT+/AWtGuOX bWpYBBhc4GSB8my4Zc8n+17nIGdjxYJJUM2u75S0d75CzYEoZYkLO+mmpU4O6YzwrubS W7w7Mp7I6Lj0ISC87BW5ThrrxAtkxaPY9kq6o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720696523; x=1721301323; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gf25M9zoO5vZznMm7cYwnz+XBjUsPdeo20Axydvsm8w=; b=JIy4kUB4/wxpLwcA+l9YG72lzEscfrvXtQMb/DbveX+6zRPcIj2Tc9mem3LLqId2EM fVfRGvPuULPkpEiFMLfBk1ud0zh6sa70bYbtbe/YaaCErVPXZRLHD7S/tboLgam3SJTp CxrwhD/VJo3WyMBdb7CZlG6flm0fKlXbsjTZJwYiqBrV45NnlehTjqu7LIwhRE+nBWDF k9t/d0owNoPWNk7cvsl6QpWevh/NMc4ZIYbe1oRzttK4/Ph8qdvk1kmZkP2ANU+pEOEV TngXQehSV9bZ70UwzWlaKlHIpxfjCuHhEsakeWF7ZK5SlGeTIPckzMdwu+MhlmYpTjjg P2iQ== X-Gm-Message-State: AOJu0YzlBrLZ+JjEhUDBfki9nhIPRhdY4V2efv0lCBYqIcHxrU308cVz gF4JUHSgrBIFB77qIF936Zuzjs4/uM/7t+sq+wBxwZACmIuqCFoWMnp6Qw85asq963G9h6fswSC R X-Google-Smtp-Source: AGHT+IFTvR+hMp9nnt7D5X0BPm5D4ydWq3OZMDWx6U0p0uhGHSb64/n7Z/D/sb6yAfV92dmqH/P1mA== X-Received: by 2002:a17:906:c309:b0:a77:e55a:9e91 with SMTP id a640c23a62f3a-a780b6b0e59mr547319266b.19.1720696523503; Thu, 11 Jul 2024 04:15:23 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 01/12] CI: Fix CONTAINER_UID0=1 scripts/containerize Date: Thu, 11 Jul 2024 12:15:06 +0100 Message-Id: <20240711111517.3064810-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Right now, most build containers use root. Archlinux, Fedora and Yocto set up a regular user called `user`. For those containers, trying to containerize as root fails, because CONTAINER_UID0=1 does nothing, whereas CONTAINER_UID0=0 forces the user away from root. To make CONTAINER_UID0=1 work reliably, force to root if requested. Fixes: 17fbe6504dfd ("automation: introduce a new variable to control container user") Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio v2: * Add fixes tag --- automation/scripts/containerize | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/containerize b/automation/scripts/containerize index acdef1b54813..03bc4837350c 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -51,7 +51,7 @@ esac # Use this variable to control whether root should be used case "_${CONTAINER_UID0}" in - _1) userarg= ;; + _1) userarg="-u 0" ;; _0|_) userarg="-u $(id -u) $userns_podman" ;; esac From patchwork Thu Jul 11 11:15:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13730469 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 C1EEAC3DA4B for ; Thu, 11 Jul 2024 11:15:42 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757325.1166179 (Exim 4.92) (envelope-from ) id 1sRrlp-0008Fn-DQ; Thu, 11 Jul 2024 11:15:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757325.1166179; Thu, 11 Jul 2024 11:15:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlp-0008E7-63; Thu, 11 Jul 2024 11:15:29 +0000 Received: by outflank-mailman (input) for mailman id 757325; Thu, 11 Jul 2024 11:15:28 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlo-0007rJ-G8 for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 11:15:28 +0000 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [2a00:1450:4864:20::536]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e0005c60-3f76-11ef-8776-851b0ebba9a2; Thu, 11 Jul 2024 13:15:27 +0200 (CEST) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-58b447c5112so1028030a12.3 for ; Thu, 11 Jul 2024 04:15:27 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7ff7d5sm246386666b.142.2024.07.11.04.15.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 04:15:23 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e0005c60-3f76-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720696525; x=1721301325; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QMdgJvw5BoA7Ynpn9dLAYsAUignCSQSLKykSZf64/SM=; b=jmMpoewFmF/AFx9Ygiex+EMmbg2sQXkFrGOh3Dz0gSSBgYgo/xAldIJkIDKedhj8N3 +Wf6mDfusnQLxXLmtSWVsZ1rCkbOzWCnAFZGuStCe8F8LanSJVa4xWGSjLQovLbobOeN OlkYx1DA+y5MCZO5nLSKRVvCfEJBup5Au8+hA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720696525; x=1721301325; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QMdgJvw5BoA7Ynpn9dLAYsAUignCSQSLKykSZf64/SM=; b=S1MJifeTx7fAOwjseITv63l2jqdWP4uUACeSDl3XEjIaz4MoptG20LU3wzU4CNWNig KQl2DpXstDZvzL1oDqBScnAo8klu0qLTj3S4DXTxDZmJf5hONtKf/rG5uu015Skd5yk6 ZgIgPaD7cGLHofzEi5dvW+m2ioId3PGRgf8FoxHANZuCx6yHJuEnuGW42TnY/0s+oQUc arkluWhXHvNCJR3ofAByTe3U1uzE24mpavxB7mo7Qx/oW+Z9UBGS2Qwy+08gk49nHSVX ANcZbZKuTp6NrbdHLEfkanGwm3jHbSngCoZo6yPnZvyTXZ+JaMgfExCGv6iomTDuYx7y X5BQ== X-Gm-Message-State: AOJu0YwKeCH9hSIRt//ofNdvwSKYNesVCVeT44bPKHi/phDv4QZEn7o6 KQHrtnSaZ7AmUiwYov9Q+NQ66Rh6peprDaqlTIo5r0sbU49ZMoB2LoXeAtHGHHb26x3awcigCx6 T X-Google-Smtp-Source: AGHT+IHD3EHDyWvqIB6M7adyUPfxyLF5B36e8K5nWoAWp1Uc7hCbjfs8JXlEgfRiNZLawBZKHB2TLA== X-Received: by 2002:a17:907:7247:b0:a77:e2e3:3546 with SMTP id a640c23a62f3a-a780b68a8d1mr755354766b.9.1720696525147; Thu, 11 Jul 2024 04:15:25 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 02/12] CI: Remove useless/misleading randconfig jobs Date: Thu, 11 Jul 2024 12:15:07 +0100 Message-Id: <20240711111517.3064810-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Randconfig builds pick CONFIG_DEBUG with 50% probability. Therefore $foo{,-debug}-randconfig are two identical jobs with misleading names. Furthermore, arm64 has a randconfig jobs for both the alpine and bookworm build environments. Both use GCC 12.2, so we have 4 identical jobs. Delete 3 of them. This leaves us with 4 primary randconfig jobs: gitlab-ci/build.yaml:381:debian-bookworm-gcc-arm32-randconfig: gitlab-ci/build.yaml:429:alpine-3.18-gcc-arm64-randconfig: gitlab-ci/build.yaml:495:archlinux-current-gcc-riscv64-randconfig: gitlab-ci/build.yaml:640:debian-bookworm-gcc-randconfig: as PPC64 doesn't want randconfig right now, and buster-gcc-ibt is a special job with a custom compiler. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio Here is an example debug-randconfig with a release builds: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/7312848876 If we want to run multiple identical randconfig jobs, that's spelt parallel: 5 in the configuration, and here is an example of what such a run looks like: https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/1368824041 Notice the randconfig jobs have a 5 in place of a retry button, and show a submenu when clicked on. --- automation/gitlab-ci/build.yaml | 39 --------------------------------- 1 file changed, 39 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index ff5c9055d1f0..da7b8885aa30 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -385,13 +385,6 @@ debian-bookworm-gcc-arm32-randconfig: HYPERVISOR_ONLY: y RANDCONFIG: y -debian-bookworm-gcc-arm32-debug-randconfig: - extends: .gcc-arm32-cross-build-debug - variables: - CONTAINER: debian:bookworm-arm64v8-arm32-gcc - HYPERVISOR_ONLY: y - RANDCONFIG: y - debian-bookworm-gcc-arm32-debug-staticmem: extends: .gcc-arm32-cross-build-debug variables: @@ -423,18 +416,6 @@ debian-bookworm-gcc-debug-arm64: variables: CONTAINER: debian:bookworm-arm64v8 -debian-bookworm-gcc-arm64-randconfig: - extends: .gcc-arm64-build - variables: - CONTAINER: debian:bookworm-arm64v8 - RANDCONFIG: y - -debian-bookworm-gcc-debug-arm64-randconfig: - extends: .gcc-arm64-build-debug - variables: - CONTAINER: debian:bookworm-arm64v8 - RANDCONFIG: y - alpine-3.18-gcc-arm64: extends: .gcc-arm64-build variables: @@ -451,12 +432,6 @@ alpine-3.18-gcc-arm64-randconfig: CONTAINER: alpine:3.18-arm64v8 RANDCONFIG: y -alpine-3.18-gcc-debug-arm64-randconfig: - extends: .gcc-arm64-build-debug - variables: - CONTAINER: alpine:3.18-arm64v8 - RANDCONFIG: y - alpine-3.18-gcc-debug-arm64-staticmem: extends: .gcc-arm64-build-debug variables: @@ -525,14 +500,6 @@ archlinux-current-gcc-riscv64-randconfig: RANDCONFIG: y <<: *riscv-fixed-randconfig -archlinux-current-gcc-riscv64-debug-randconfig: - extends: .gcc-riscv64-cross-build-debug - variables: - CONTAINER: archlinux:current-riscv64 - KBUILD_DEFCONFIG: tiny64_defconfig - RANDCONFIG: y - <<: *riscv-fixed-randconfig - # Power cross-build debian-bullseye-gcc-ppc64le: extends: .gcc-ppc64le-cross-build @@ -676,12 +643,6 @@ debian-bookworm-gcc-randconfig: CONTAINER: debian:bookworm RANDCONFIG: y -debian-bookworm-gcc-debug-randconfig: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: debian:bookworm - RANDCONFIG: y - debian-bookworm-32-clang-debug: extends: .clang-x86-32-build-debug variables: From patchwork Thu Jul 11 11:15:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13730465 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 AFC52C3DA4B for ; Thu, 11 Jul 2024 11:15:39 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757324.1166174 (Exim 4.92) (envelope-from ) id 1sRrlp-00089F-5F; Thu, 11 Jul 2024 11:15:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757324.1166174; Thu, 11 Jul 2024 11:15:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlo-00088k-TH; Thu, 11 Jul 2024 11:15:28 +0000 Received: by outflank-mailman (input) for mailman id 757324; Thu, 11 Jul 2024 11:15:28 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlo-0007rD-35 for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 11:15:28 +0000 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [2a00:1450:4864:20::62f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e045db34-3f76-11ef-bbfb-fd08da9f4363; Thu, 11 Jul 2024 13:15:27 +0200 (CEST) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-a77e2f51496so112808166b.0 for ; Thu, 11 Jul 2024 04:15:27 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7ff7d5sm246386666b.142.2024.07.11.04.15.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 04:15:25 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e045db34-3f76-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720696526; x=1721301326; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L/meM4LOF0SLC51tAEKjDtfLnz5/szauziEh2ia+Hxk=; b=aATb1H4JT4ybYjxTIs4zH2AibqoNQRrqvSAWBrynD9P91ngi3GKIvsSuuSPcLuH7wG qbbyfxgvmvzZUGkGy/OeoDhcikJlj0152Qy13wxx2eFIm9KuD/1c3S8nl+b31+xs+vI5 km8vSlN2wVZFYEtmLLfOwiwQacF2nCxE0/rE4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720696526; x=1721301326; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L/meM4LOF0SLC51tAEKjDtfLnz5/szauziEh2ia+Hxk=; b=rr+qHBFUy/sj+LcyiBCUtbWJc7dRmM2o2kSu8eBHeG7prdkGhJINcXybsEMDJvEtKf xfxV/VAOQCIjvNCd2eLAALQzM7Ih5rHjCUdUUKzyZxFSHyYDcewJReCquGX+Qm0XIrl8 Xe+5bdUUTd+A45SO8MOcyA+02C1yA9btNXFLAoAWoIt6UIimG190Uu3CTTFTi4TcWiO9 A1PixG39Cc+irXD+r+duFg1tGpJwdXOQYjy57zLviSR654WyFmXygP9OEuWBCMhZrjWZ UYH5LUBrpVVOvlqEWWEO3A0yHoWEfjvYqMEmgejQzbfE+uOLmqhEtv76gpRVe6Xd7RT5 hYIg== X-Gm-Message-State: AOJu0Yz2PVWvIPE4TQpZ5Sj9/1EmhRPIj2hdNQsB/7MM7O6LkLhstYfg SD1oCY2eookHdbjrlHg7ThcTegZhFLahfCfDSw2/JfUXcw3iDtJuHz8LLagu1GyoUtvaAnxez+2 h X-Google-Smtp-Source: AGHT+IHHDkvg4Tc1JebNvajW43vBdtx3XCYg8dIoey6SD94uRNl0Hcmzz+XWpyqp5Wn4XnW/oUbhnQ== X-Received: by 2002:a17:906:2342:b0:a77:e1fb:7dec with SMTP id a640c23a62f3a-a780b6b316dmr486049266b.17.1720696525947; Thu, 11 Jul 2024 04:15:25 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 03/12] CI: Drop Debian Jessie dockerfiles Date: Thu, 11 Jul 2024 12:15:08 +0100 Message-Id: <20240711111517.3064810-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 These were removed from testing in Xen 4.18. Fixes: 3817e3c1b4b8 ("automation: Remove testing on Debian Jessie") Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- .../build/debian/jessie-i386.dockerfile | 55 ------------------- automation/build/debian/jessie.dockerfile | 52 ------------------ automation/scripts/containerize | 2 - 3 files changed, 109 deletions(-) delete mode 100644 automation/build/debian/jessie-i386.dockerfile delete mode 100644 automation/build/debian/jessie.dockerfile diff --git a/automation/build/debian/jessie-i386.dockerfile b/automation/build/debian/jessie-i386.dockerfile deleted file mode 100644 index dfa6dae06cb8..000000000000 --- a/automation/build/debian/jessie-i386.dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/i386 debian/eol:jessie -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV USER root - -RUN mkdir /build -WORKDIR /build - -ENTRYPOINT ["linux32"] - -# replace repos in archive as release is EOL -COPY <<"END" /etc/apt/sources.list -deb http://archive.debian.org/debian/ jessie main contrib non-free -deb http://archive.debian.org/debian/ jessie-backports main contrib non-free -deb http://archive.debian.org/debian-security/ jessie/updates main contrib non-free -END - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - zlib1g-dev \ - libncurses5-dev \ - python-dev \ - uuid-dev \ - libyajl-dev \ - libaio-dev \ - libglib2.0-dev \ - clang \ - libpixman-1-dev \ - pkg-config \ - flex \ - bison \ - acpica-tools \ - bin86 \ - bcc \ - liblzma-dev \ - libc6-dev \ - libnl-3-dev \ - ocaml-nox \ - libfindlib-ocaml-dev \ - markdown \ - transfig \ - pandoc \ - checkpolicy \ - wget \ - git \ - nasm \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile deleted file mode 100644 index 82dae9ec70c4..000000000000 --- a/automation/build/debian/jessie.dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 debian/eol:jessie -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# replace repos in archive as release is EOL -COPY <<"END" /etc/apt/sources.list -deb http://archive.debian.org/debian/ jessie main contrib non-free -deb http://archive.debian.org/debian/ jessie-backports main contrib non-free -deb http://archive.debian.org/debian-security/ jessie/updates main contrib non-free -END - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - zlib1g-dev \ - libncurses5-dev \ - python-dev \ - uuid-dev \ - libyajl-dev \ - libaio-dev \ - libglib2.0-dev \ - clang \ - libpixman-1-dev \ - pkg-config \ - flex \ - bison \ - acpica-tools \ - bin86 \ - bcc \ - liblzma-dev \ - libnl-3-dev \ - ocaml-nox \ - libfindlib-ocaml-dev \ - markdown \ - transfig \ - pandoc \ - checkpolicy \ - wget \ - git \ - nasm \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* diff --git a/automation/scripts/containerize b/automation/scripts/containerize index 03bc4837350c..57db42d10cb5 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -31,8 +31,6 @@ case "_${CONTAINER}" in _centos7) CONTAINER="${BASE}/centos:7" ;; _fedora) CONTAINER="${BASE}/fedora:29";; _focal) CONTAINER="${BASE}/ubuntu:focal" ;; - _jessie) CONTAINER="${BASE}/debian:jessie" ;; - _jessie-i386) CONTAINER="${BASE}/debian:jessie-i386" ;; _bullseye-ppc64le) CONTAINER="${BASE}/debian:bullseye-ppc64le" ;; _stretch|_) CONTAINER="${BASE}/debian:stretch" ;; _stretch-i386) CONTAINER="${BASE}/debian:stretch-i386" ;; From patchwork Thu Jul 11 11:15:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13730467 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 B1BDEC3DA4E for ; Thu, 11 Jul 2024 11:15:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757326.1166197 (Exim 4.92) (envelope-from ) id 1sRrlr-0000Pz-Mr; Thu, 11 Jul 2024 11:15:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757326.1166197; Thu, 11 Jul 2024 11:15:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlr-0000Pq-JJ; Thu, 11 Jul 2024 11:15:31 +0000 Received: by outflank-mailman (input) for mailman id 757326; Thu, 11 Jul 2024 11:15:29 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlp-0007rD-Ro for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 11:15:29 +0000 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [2a00:1450:4864:20::532]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e144a14b-3f76-11ef-bbfb-fd08da9f4363; Thu, 11 Jul 2024 13:15:29 +0200 (CEST) Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-58c2e5e8649so2725407a12.1 for ; Thu, 11 Jul 2024 04:15:29 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7ff7d5sm246386666b.142.2024.07.11.04.15.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 04:15:26 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e144a14b-3f76-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720696528; x=1721301328; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c9Zc7WCDax6tOV1wBSJ+65HBId20FDc5PP86u+0cBhQ=; b=hlM3SNv1corJSqJObHoUI2/dIMSUU6Nwb3sYLNxRYMcM6Wce4mJdS7p95oQsCCYirV fgTbewrpwiW/hVTR1KFYeJeEOSQJC89BlzE9Wb422cpfdM3GWy+pNtk/r+JyhTeDfRva 5Qcl5AYPxxJiGldYZyusEGdSQRVTd8Q+gefJE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720696528; x=1721301328; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c9Zc7WCDax6tOV1wBSJ+65HBId20FDc5PP86u+0cBhQ=; b=kaMcxrVkX4YQRPbOP3JA1m8rwI4csb0g3wZ5Dxv4P9u3N3yz5utkBhkub4OzS+89Gh Wa/V+FlimE8/xCopMz2aPFN8wbEsPvsjrXy+FRQSEUkT20st32GHrWSkd3Ah39uAWTvu 6wt7lEQY1aDKVYVrqeMyFA80JR0YyTlIYJNNP1ObSXUctt6kOxqOSGyiprDlSj4cXbpy Fe344YHPyZsPv7NaGuwlP0W8Qpt2xSLZRIKMoNPmbphXFWALsSHAlWt/GN/I541nIUgP q1Sa8RxBpvDL5L7Xhzm0a314ualgh5K7LSH4m052KfJ5/pxL+xJlg7LRMwss3PJDGEWX BVjQ== X-Gm-Message-State: AOJu0YxJoHhF0ddzA9TCEAkDp6qytW3+GEjUBw3lUanXDOhhLdKxvvAN 7Arp7Y2bwm9zyt8Cfpltjmi63COVEMYdNE53Fpmbb/VQ6+zDSlnWqGv3eT0S76IefJvpHOLjoIP g X-Google-Smtp-Source: AGHT+IHmgObZliaurhNFDctglm8aZEzzMupYYWiqFWt/5Sx/Dyv7ihYOfDkLMbusTKLGclFlNFUCgQ== X-Received: by 2002:a17:906:308d:b0:a6f:2835:be95 with SMTP id a640c23a62f3a-a79921e4f59mr80147766b.37.1720696527778; Thu, 11 Jul 2024 04:15:27 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 04/12] CI: Drop Debian Stretch testing Date: Thu, 11 Jul 2024 12:15:09 +0100 Message-Id: <20240711111517.3064810-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Debian stretch is also End of Life. Update a couple of test steps to use bookworm instead. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- .../build/debian/stretch-i386.dockerfile | 57 ------------------ automation/build/debian/stretch.dockerfile | 60 ------------------- automation/gitlab-ci/build.yaml | 34 +---------- automation/gitlab-ci/test.yaml | 4 +- automation/scripts/containerize | 2 - 5 files changed, 4 insertions(+), 153 deletions(-) delete mode 100644 automation/build/debian/stretch-i386.dockerfile delete mode 100644 automation/build/debian/stretch.dockerfile diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile deleted file mode 100644 index 905096ab0ef1..000000000000 --- a/automation/build/debian/stretch-i386.dockerfile +++ /dev/null @@ -1,57 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/i386 debian:stretch -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV USER root - -RUN mkdir /build -WORKDIR /build - -ENTRYPOINT ["linux32"] - -# replace repos in archive as release is EOL -COPY <<"END" /etc/apt/sources.list -deb http://archive.debian.org/debian/ stretch main contrib non-free -deb http://archive.debian.org/debian/ stretch-backports main contrib non-free -deb http://archive.debian.org/debian-security/ stretch/updates main contrib non-free -END - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - zlib1g-dev \ - libncurses5-dev \ - python-dev \ - python3-dev \ - uuid-dev \ - libyajl-dev \ - libaio-dev \ - libglib2.0-dev \ - clang \ - libpixman-1-dev \ - pkg-config \ - flex \ - bison \ - acpica-tools \ - bin86 \ - bcc \ - liblzma-dev \ - libc6-dev \ - libnl-3-dev \ - ocaml-nox \ - libfindlib-ocaml-dev \ - markdown \ - transfig \ - pandoc \ - checkpolicy \ - wget \ - git \ - nasm \ - apt-transport-https \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile deleted file mode 100644 index b99d229acf14..000000000000 --- a/automation/build/debian/stretch.dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 debian:stretch -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# replace repos in archive as release is EOL -COPY <<"END" /etc/apt/sources.list -deb http://archive.debian.org/debian/ stretch main contrib non-free -deb http://archive.debian.org/debian/ stretch-backports main contrib non-free -deb http://archive.debian.org/debian-security/ stretch/updates main contrib non-free -END - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - zlib1g-dev \ - libncurses5-dev \ - python-dev \ - python3-dev \ - uuid-dev \ - libyajl-dev \ - libaio-dev \ - libglib2.0-dev \ - clang \ - libpixman-1-dev \ - pkg-config \ - flex \ - bison \ - acpica-tools \ - bin86 \ - bcc \ - liblzma-dev \ - libnl-3-dev \ - ocaml-nox \ - libfindlib-ocaml-dev \ - markdown \ - transfig \ - pandoc \ - checkpolicy \ - wget \ - git \ - nasm \ - gnupg \ - apt-transport-https \ - # for test phase, qemu-smoke-* jobs - qemu-system-x86 \ - # for test phase, qemu-alpine-* jobs - cpio \ - busybox-static \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index da7b8885aa30..2c6eb17bef50 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -354,10 +354,10 @@ alpine-3.18-gcc-debug: variables: CONTAINER: alpine:3.18 -debian-stretch-gcc-debug: +debian-bookworm-gcc-debug: extends: .gcc-x86-64-build-debug variables: - CONTAINER: debian:stretch + CONTAINER: debian:bookworm debian-bookworm-clang-debug: extends: .clang-x86-64-build-debug @@ -589,31 +589,6 @@ centos-7-gcc-debug: variables: CONTAINER: centos:7 -debian-stretch-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: debian:stretch - -debian-stretch-clang: - extends: .clang-x86-64-build - variables: - CONTAINER: debian:stretch - -debian-stretch-clang-debug: - extends: .clang-x86-64-build-debug - variables: - CONTAINER: debian:stretch - -debian-stretch-32-clang-debug: - extends: .clang-x86-32-build-debug - variables: - CONTAINER: debian:stretch-i386 - -debian-stretch-32-gcc-debug: - extends: .gcc-x86-32-build-debug - variables: - CONTAINER: debian:stretch-i386 - debian-buster-gcc-ibt: extends: .gcc-x86-64-build variables: @@ -632,11 +607,6 @@ debian-bookworm-gcc: variables: CONTAINER: debian:bookworm -debian-bookworm-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: debian:bookworm - debian-bookworm-gcc-randconfig: extends: .gcc-x86-64-build variables: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 898d2adc8c5b..d50e522f9f79 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -412,7 +412,7 @@ qemu-smoke-x86-64-gcc: script: - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE} needs: - - debian-stretch-gcc-debug + - debian-bookworm-gcc-debug qemu-smoke-x86-64-clang: extends: .qemu-x86-64 @@ -426,7 +426,7 @@ qemu-smoke-x86-64-gcc-pvh: script: - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE} needs: - - debian-stretch-gcc-debug + - debian-bookworm-gcc-debug qemu-smoke-x86-64-clang-pvh: extends: .qemu-x86-64 diff --git a/automation/scripts/containerize b/automation/scripts/containerize index 57db42d10cb5..5140765cee98 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -32,8 +32,6 @@ case "_${CONTAINER}" in _fedora) CONTAINER="${BASE}/fedora:29";; _focal) CONTAINER="${BASE}/ubuntu:focal" ;; _bullseye-ppc64le) CONTAINER="${BASE}/debian:bullseye-ppc64le" ;; - _stretch|_) CONTAINER="${BASE}/debian:stretch" ;; - _stretch-i386) CONTAINER="${BASE}/debian:stretch-i386" ;; _buster-gcc-ibt) CONTAINER="${BASE}/debian:buster-gcc-ibt" ;; _bookworm|_) CONTAINER="${BASE}/debian:bookworm" ;; _bookworm-i386) CONTAINER="${BASE}/debian:bookworm-i386" ;; From patchwork Thu Jul 11 11:15:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13730464 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 45FABC3DA4A for ; Thu, 11 Jul 2024 11:15:39 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757327.1166202 (Exim 4.92) (envelope-from ) id 1sRrls-0000SG-07; Thu, 11 Jul 2024 11:15:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757327.1166202; Thu, 11 Jul 2024 11:15:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlr-0000Rb-PL; Thu, 11 Jul 2024 11:15:31 +0000 Received: by outflank-mailman (input) for mailman id 757327; Thu, 11 Jul 2024 11:15:30 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlq-0007rD-LO for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 11:15:30 +0000 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [2a00:1450:4864:20::135]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e1d1126a-3f76-11ef-bbfb-fd08da9f4363; Thu, 11 Jul 2024 13:15:29 +0200 (CEST) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-52ea7d2a039so780464e87.3 for ; Thu, 11 Jul 2024 04:15:30 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7ff7d5sm246386666b.142.2024.07.11.04.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 04:15:28 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e1d1126a-3f76-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720696528; x=1721301328; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tAHuZgHoF2exqi8oaOVtjkQF+Fln/FT2w5YgzvR4eVA=; b=ldznZDsntPj1nxdbH6+r65PN/8suh7prGDIZiHhi66mdVizfAnRXodhEo01o/svKBb yeAP4W4BVz7sGT7n2whUJQgw7H+i2Mn8KngcKxzjRhwSi2vjMlK+Bfjt9QEzW9LYkfKV z9M5Cok+Oea8m7yeH0sGx0+/JgthwtKNk+CAo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720696528; x=1721301328; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tAHuZgHoF2exqi8oaOVtjkQF+Fln/FT2w5YgzvR4eVA=; b=rLIW3pDXud8+OOta33JpigkltIrDtUQE3sAAyFBx9M+Dzx14HfDDRJC+u4Txg579A1 V8C1vQSPxn7EcMz2dMaF+aYBL8MpbnALYEhlTHrcdRotELB4JlBuqsBDI3YXI6LTsiGX xM2FgEf54t6mGK0MxXa2pi1wyAqopisyYPbcuUNAe0kro79W/zo0i4MyKo74CnU7jpMS EhKJdSfoxzrK31AhlC405l2qn0nqKYlxVoJPQqagOgwGmxqcRGg/DOT8LhUnzu9QU9DF mROPAKOewsswiQvih83TPWCI7n9cXN7FQUUCTTsUYUI4dr7A8YNDBfIo6RJtukWL7Fbg nyTw== X-Gm-Message-State: AOJu0Yyc3i8GGIutOjdD6ytFoBT5nWef69kMdJbibqckOc+a+G/Y0JzB u9TWx3HyNd70rRT8s9wvADW/KKc27at5l7pKVxyr8NznENEOwY67Dgj7uyhJQHTvgjDnp5dVnIo 8 X-Google-Smtp-Source: AGHT+IH3eHhpMt5JixBNtCVG5d70gnp7RhzK3eL2/QC1E+fTy3wxvek4a12zgAmqccSYEchjVUdzHg== X-Received: by 2002:a05:6512:4016:b0:52c:ce28:82c8 with SMTP id 2adb3069b0e04-52eb99d4c5dmr6580137e87.52.1720696528522; Thu, 11 Jul 2024 04:15:28 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 05/12] CI: Drop Ubuntu Trusty testing Date: Thu, 11 Jul 2024 12:15:10 +0100 Message-Id: <20240711111517.3064810-6-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 This is also End of Life. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- automation/build/ubuntu/trusty.dockerfile | 51 ----------------------- automation/gitlab-ci/build.yaml | 12 ------ automation/scripts/containerize | 1 - 3 files changed, 64 deletions(-) delete mode 100644 automation/build/ubuntu/trusty.dockerfile diff --git a/automation/build/ubuntu/trusty.dockerfile b/automation/build/ubuntu/trusty.dockerfile deleted file mode 100644 index 1cda1bbd3fea..000000000000 --- a/automation/build/ubuntu/trusty.dockerfile +++ /dev/null @@ -1,51 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 ubuntu:14.04 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - zlib1g-dev \ - libncurses5-dev \ - python-dev \ - python3-dev \ - uuid-dev \ - libyajl-dev \ - libaio-dev \ - libglib2.0-dev \ - clang \ - libpixman-1-dev \ - pkg-config \ - flex \ - bison \ - acpica-tools \ - bin86 \ - bcc \ - liblzma-dev \ - libnl-3-dev \ - ocaml-nox \ - libfindlib-ocaml-dev \ - markdown \ - transfig \ - pandoc \ - checkpolicy \ - wget \ - git \ - nasm \ - && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* - -# Remove expired certificate that Let's Encrypt certificates used to relie on. -# (Not needed anymore) -RUN sed -i 's#mozilla/DST_Root_CA_X3\.crt#!\0#' /etc/ca-certificates.conf && \ - update-ca-certificates diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 2c6eb17bef50..3e299f34f461 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -633,18 +633,6 @@ fedora-gcc-debug: variables: CONTAINER: fedora:29 -# Ubuntu Trusty's Clang is 3.4 while Xen requires 3.5 - -ubuntu-trusty-gcc: - extends: .gcc-x86-64-build - variables: - CONTAINER: ubuntu:trusty - -ubuntu-trusty-gcc-debug: - extends: .gcc-x86-64-build-debug - variables: - CONTAINER: ubuntu:trusty - ubuntu-xenial-clang: extends: .clang-x86-64-build variables: diff --git a/automation/scripts/containerize b/automation/scripts/containerize index 5140765cee98..e9ad20aa0c80 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -39,7 +39,6 @@ case "_${CONTAINER}" in _bookworm-arm64v8) CONTAINER="${BASE}/debian:bookworm-arm64v8" ;; _bookworm-cppcheck) CONTAINER="${BASE}/debian:bookworm-cppcheck" ;; _bionic) CONTAINER="${BASE}/ubuntu:bionic" ;; - _trusty) CONTAINER="${BASE}/ubuntu:trusty" ;; _xenial) CONTAINER="${BASE}/ubuntu:xenial" ;; _opensuse-leap|_leap) CONTAINER="${BASE}/suse:opensuse-leap" ;; _opensuse-tumbleweed|_tumbleweed) CONTAINER="${BASE}/suse:opensuse-tumbleweed" ;; From patchwork Thu Jul 11 11:15:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13730468 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 79859C3DA4D for ; Thu, 11 Jul 2024 11:15:40 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757328.1166216 (Exim 4.92) (envelope-from ) id 1sRrlt-0000rY-95; Thu, 11 Jul 2024 11:15:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757328.1166216; Thu, 11 Jul 2024 11:15:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlt-0000r8-2t; Thu, 11 Jul 2024 11:15:33 +0000 Received: by outflank-mailman (input) for mailman id 757328; Thu, 11 Jul 2024 11:15:32 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrls-0007rD-Dd for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 11:15:32 +0000 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [2a00:1450:4864:20::534]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e2ef9dd7-3f76-11ef-bbfb-fd08da9f4363; Thu, 11 Jul 2024 13:15:31 +0200 (CEST) Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-58bac81f419so923885a12.0 for ; Thu, 11 Jul 2024 04:15:31 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7ff7d5sm246386666b.142.2024.07.11.04.15.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 04:15:28 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e2ef9dd7-3f76-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720696530; x=1721301330; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YKFCUmHn/euIN4BAYOnChKlddyPJSKX/LUNusA/vBnA=; b=LPRcR6d02bMp6ulwU7ivxHXA2ZT0lq2SEXp7kn8vBfLr88GO3obK/FNG7euxzcPz5b r7kbevpxjNnTPa9xXcLJRqIeobnmZy9Gaga2ajl8ytss1W1akn6gqH0Nd+PAJR+QtJZ0 3fTqan71zgHsHPa0AH+DfC9coTaUXYSg3T2+w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720696530; x=1721301330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YKFCUmHn/euIN4BAYOnChKlddyPJSKX/LUNusA/vBnA=; b=HbkoAejir2/4M1y0oMpo9HeQdMDGHliTbjcCqWrAtQEMxmUOoLpc4Ud9JleIDpfAo0 E3VBP3z++SqenJsXuE/JdkdPjH7gxUofaCUN5PV344Zx/7H9otezoFCTVFufKUNUQ3Sv C2p1gX3Co7mDeqL1LQU20qDWYTjCrC8F3KWwR+bB98Yku038x0MJ+iigkQwXtEYV32Cg FpM5MrHtzDKvoRRqdn/LbeqtP8R0lUh9EyrnLVeDyywCx6IBNE2mvuJHm2QS3BSw9UK4 H52fajV90eukrMreqsyG95SwayCh38tZGrpf4vtI+RhubPn8NOX1V2ZQai1YN9HN2OQL cuCw== X-Gm-Message-State: AOJu0Yx05OjSuAyLG7Zvn0+WybZ6eUx3utp1eBjzEvKxd0w0Oke+qA3l bakc48e1cO1Ftt8d5pZGDNlqOQqYzWNWiDSqzxkZjtR++GoHtVjWGMzzFU91GfGKe31Hm4TI7bw G X-Google-Smtp-Source: AGHT+IFDY6RbUzLLr+uU7QW4rKNVYt3L0k0y4hzz/H9ybWHb9otZkXB4u8qIzu8bcZh0VfCDJ8yUuQ== X-Received: by 2002:a17:906:451:b0:a77:db36:1cc6 with SMTP id a640c23a62f3a-a780b89a166mr443901466b.68.1720696530438; Thu, 11 Jul 2024 04:15:30 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 06/12] CI: Mark Archlinux/x86 as allowing failures Date: Thu, 11 Jul 2024 12:15:11 +0100 Message-Id: <20240711111517.3064810-7-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Archlinux is a rolling distro, and is subject to arbitrary changes as the container is rebuilt. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- automation/gitlab-ci/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 3e299f34f461..1446bc1d0ea7 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -573,11 +573,13 @@ archlinux-gcc: extends: .gcc-x86-64-build variables: CONTAINER: archlinux:current + allow_failure: true archlinux-gcc-debug: extends: .gcc-x86-64-build-debug variables: CONTAINER: archlinux:current + allow_failure: true centos-7-gcc: extends: .gcc-x86-64-build From patchwork Thu Jul 11 11:15:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13730470 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 5A4EFC3DA4A for ; Thu, 11 Jul 2024 11:15:43 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757329.1166227 (Exim 4.92) (envelope-from ) id 1sRrlu-0001Cn-I1; Thu, 11 Jul 2024 11:15:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757329.1166227; Thu, 11 Jul 2024 11:15:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlu-0001CZ-E8; Thu, 11 Jul 2024 11:15:34 +0000 Received: by outflank-mailman (input) for mailman id 757329; Thu, 11 Jul 2024 11:15:33 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlt-0007rD-Iz for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 11:15:33 +0000 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [2a00:1450:4864:20::531]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e3a2f2c4-3f76-11ef-bbfb-fd08da9f4363; Thu, 11 Jul 2024 13:15:33 +0200 (CEST) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-585e774fd3dso1047240a12.0 for ; Thu, 11 Jul 2024 04:15:33 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7ff7d5sm246386666b.142.2024.07.11.04.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 04:15:30 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e3a2f2c4-3f76-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720696532; x=1721301332; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RL63T9x2NC9K+sPMKqGW4jz6nO38f+CeHmJOCnQFiPo=; b=EYaZ0U2bBd/mQNFUaoMY7aeHdz4b2GP34jqAuVJUDHw2qfchgg3vuEY5+3m2259SvX HsgpHgWTZXgNNvS8XY4jopfVVhUqJmv5vNScqmRTSgUfTwVNFa5Sl1gXZwNjY09aL+NW 8bMlSrYYZuCl1VEYk4KIrXPqAsP0q4fnzV8iI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720696532; x=1721301332; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RL63T9x2NC9K+sPMKqGW4jz6nO38f+CeHmJOCnQFiPo=; b=v+rQqmAfkr6KSzs08eQEaWbgW2HhU7SKVMW3CxrXj7bJ+0/lVyn3hLc3gtVU2AUx8/ ekqXKiAlvPRFBc9ap/Pnn5gtzeg3ICMO98dv7ijCnHCf6XTMlgnBEMxv2x1SgP4sutOx Hfo28oZDO6Gv9/eOUur+AtffsP0xqfqb1K/xWDNwQs9mlzdBVs0hYzKzm5IPLKTljtio hVdU+nhOADP7gWWU0NAvRFJ8pYRVTU/9mufj5QMXnszFivM3GwooB5N/EDzH2tZJ8OY7 6UFx6pL04Cs67rCtvLQ2muXtmPN7xktuy67Pkiud+WLUANEISlKutu+vB6v3xIiLP7Et fX1A== X-Gm-Message-State: AOJu0YxzJ+YyWgbtHUUMa5wfsELX7rMWfK+ZUAmBcbAgf2abcOxg/aEx y/pINriafcxigSvn8ymZ2DFR95dEKYaMb85m0GFLhTLfn00L5RotzU5uT9tNAefz8aQlpHOe/Mh e X-Google-Smtp-Source: AGHT+IGupRV+XUgG2IowOX9DRoGWBEplDxEEQEoprzyI0WvvhM+VDMnqnqeyKw+Ly3em6CtOtziqMg== X-Received: by 2002:a17:906:b319:b0:a72:676a:7d7b with SMTP id a640c23a62f3a-a780b688906mr677491866b.9.1720696532239; Thu, 11 Jul 2024 04:15:32 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 07/12] CI: Introduce a debian:12-ppc64le container Date: Thu, 11 Jul 2024 12:15:12 +0100 Message-Id: <20240711111517.3064810-8-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Make it non-root by default, and set XEN_TARGET_ARCH=ppc64 too. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- automation/build/debian/12-ppc64le.dockerfile | 36 +++++++++++++++++++ automation/scripts/containerize | 1 + 2 files changed, 37 insertions(+) create mode 100644 automation/build/debian/12-ppc64le.dockerfile diff --git a/automation/build/debian/12-ppc64le.dockerfile b/automation/build/debian/12-ppc64le.dockerfile new file mode 100644 index 000000000000..3b311e675ef5 --- /dev/null +++ b/automation/build/debian/12-ppc64le.dockerfile @@ -0,0 +1,36 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 debian:bookworm-slim +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV CROSS_COMPILE=powerpc64le-linux-gnu- +ENV XEN_TARGET_ARCH=ppc64 + +RUN < X-Patchwork-Id: 13730473 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 5761AC3DA4B for ; Thu, 11 Jul 2024 11:15:47 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757330.1166237 (Exim 4.92) (envelope-from ) id 1sRrlx-0001b5-0m; Thu, 11 Jul 2024 11:15:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757330.1166237; Thu, 11 Jul 2024 11:15:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlw-0001al-SJ; Thu, 11 Jul 2024 11:15:36 +0000 Received: by outflank-mailman (input) for mailman id 757330; Thu, 11 Jul 2024 11:15:35 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlv-0007rD-Bd for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 11:15:35 +0000 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [2a00:1450:4864:20::62c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e49f2f01-3f76-11ef-bbfb-fd08da9f4363; Thu, 11 Jul 2024 13:15:34 +0200 (CEST) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-a77ec5d3b0dso101533466b.0 for ; Thu, 11 Jul 2024 04:15:34 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7ff7d5sm246386666b.142.2024.07.11.04.15.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 04:15:32 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e49f2f01-3f76-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720696533; x=1721301333; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GGXMWhwWhR4eu24XAy5thYClOJ/SD11Mbj0BOcW/2q4=; b=gjZwvwC3mWwTWhhznnqIKLhSJxrjv3161TNvkvdX9czRZmF4HQtZleDkAO1lmAI6WW WELYekx6PfO5aEUG+KLswHLHEBwcDBiZfYBuci0a3IWp4HL1QVAAH1BvortH75tbxNn+ CuNaJhqBWlgC3htYQyPljpPgwKevSRuTFAGGo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720696533; x=1721301333; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GGXMWhwWhR4eu24XAy5thYClOJ/SD11Mbj0BOcW/2q4=; b=mMFv3Olyycuv5VonahSgWiHnNaYEB8ghftjbv9QegW5PqXS27DBossHQ+Qh19xjyVB u9TqhBel84AUNn0DHvKPajPSzQ222bx3QcxSC+EiExsRQCFKhOmt9tkXNRFuIHMpEnRn iRRTnFjZ047YmeKBMeZJV41LjRZecCOCWs52dUZHKs0c8xMWGELasmBKBUWo7oLxz9vS FUCitTQeeH/Uk0LMmla5caDCHc1kzxrPdh/B8TflKhiygoACaIXJxR89JYESI7XHBBjc 3V+tmtjRCKmTSmu7j5Q9AE3g1TiBHI7qLrhBdNo84QEMQfsKFazfc8fIo5WpWZY9hBN+ h7Pw== X-Gm-Message-State: AOJu0YzBo2cGSb9tKKoiHpx0mc4NSQKqNO6GzKH9Tej5oWAuRVxHlLjg Y+8pNgoI7XNI+4O5A+wfZ9PZ64z72Su4snBev9axpAINMMkfcUVRsKsUluZcBrt+yAhg0/HrFmj Z X-Google-Smtp-Source: AGHT+IF7Ddg0v7erLjz9gTj8Rdrl6n/v+Oz4ajX7EkmQdnvN1xRBwsxmyTxjJldGrDJOozxFrK0Hdg== X-Received: by 2002:a17:906:6a25:b0:a77:c657:5942 with SMTP id a640c23a62f3a-a780b88b3d8mr699173066b.52.1720696533420; Thu, 11 Jul 2024 04:15:33 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 08/12] CI: Use debian:12-ppc64le for both build and test Date: Thu, 11 Jul 2024 12:15:13 +0100 Message-Id: <20240711111517.3064810-9-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 qemu-system-ppc64/8.1.0-ppc64 was added because bullseye's Qemu didn't understand the powernv9 machine. However, bookworm's Qemu does, and this is preforable to maintaining a random build of Qemu ourselves. Add bookworm builds, and retain bullseye to keep our lower-bound toolchain testing. Rename the jobs to follow to sort coherently ($DISTRO-$VERSION-$ARCH-*) and reposition the jobs to optimise starting the smoke test. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- automation/gitlab-ci/build.yaml | 59 ++++++++++--------- automation/gitlab-ci/test.yaml | 5 +- automation/scripts/qemu-smoke-ppc64le.sh | 4 +- .../qemu-system-ppc64/8.1.0-ppc64.dockerfile | 38 ------------ 4 files changed, 34 insertions(+), 72 deletions(-) delete mode 100644 automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 1446bc1d0ea7..316dc4345f29 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -302,20 +302,6 @@ qemu-system-aarch64-6.0.0-arm32-export: tags: - arm64 -# ppc64 test artifacts - -qemu-system-ppc64-8.1.0-ppc64-export: - extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-ppc64:8.1.0-ppc64 - script: - - mkdir binaries && cp /qemu-system-ppc64 /skiboot.lid binaries/ - artifacts: - paths: - - binaries/qemu-system-ppc64 - - binaries/skiboot.lid - tags: - - x86_64 - # x86_64 test artifacts alpine-3.18-rootfs-export: @@ -364,6 +350,13 @@ debian-bookworm-clang-debug: variables: CONTAINER: debian:bookworm +debian-12-ppc64le-gcc-debug: + extends: .gcc-ppc64le-cross-build-debug + variables: + CONTAINER: debian:12-ppc64le + KBUILD_DEFCONFIG: ppc64_defconfig + HYPERVISOR_ONLY: y + # Arm32 cross-build debian-bookworm-gcc-arm32: @@ -500,21 +493,6 @@ archlinux-current-gcc-riscv64-randconfig: RANDCONFIG: y <<: *riscv-fixed-randconfig -# Power cross-build -debian-bullseye-gcc-ppc64le: - extends: .gcc-ppc64le-cross-build - variables: - CONTAINER: debian:bullseye-ppc64le - KBUILD_DEFCONFIG: ppc64_defconfig - HYPERVISOR_ONLY: y - -debian-bullseye-gcc-ppc64le-debug: - extends: .gcc-ppc64le-cross-build-debug - variables: - CONTAINER: debian:bullseye-ppc64le - KBUILD_DEFCONFIG: ppc64_defconfig - HYPERVISOR_ONLY: y - # Yocto test jobs yocto-qemuarm64: extends: .yocto-test-arm64 @@ -738,3 +716,26 @@ opensuse-tumbleweed-gcc-debug: variables: CONTAINER: suse:opensuse-tumbleweed allow_failure: true + +# PowerPC builds (x86 cross) +debian-bullseye-gcc-ppc64le: + extends: .gcc-ppc64le-cross-build + variables: + CONTAINER: debian:bullseye-ppc64le + KBUILD_DEFCONFIG: ppc64_defconfig + HYPERVISOR_ONLY: y + +debian-bullseye-gcc-ppc64le-debug: + extends: .gcc-ppc64le-cross-build-debug + variables: + CONTAINER: debian:bullseye-ppc64le + KBUILD_DEFCONFIG: ppc64_defconfig + HYPERVISOR_ONLY: y + +debian-12-ppc64le-gcc: + extends: .gcc-ppc64le-cross-build + variables: + CONTAINER: debian:12-ppc64le + KBUILD_DEFCONFIG: ppc64_defconfig + HYPERVISOR_ONLY: y + diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index d50e522f9f79..70c946f87799 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -69,7 +69,7 @@ .qemu-ppc64le: extends: .test-jobs-common variables: - CONTAINER: debian:bullseye-ppc64le + CONTAINER: debian:12-ppc64le LOGFILE: qemu-smoke-ppc64le.log artifacts: paths: @@ -447,5 +447,4 @@ qemu-smoke-ppc64le-powernv9-gcc: script: - ./automation/scripts/qemu-smoke-ppc64le.sh powernv9 2>&1 | tee ${LOGFILE} needs: - - qemu-system-ppc64-8.1.0-ppc64-export - - debian-bullseye-gcc-ppc64le-debug + - debian-12-ppc64le-gcc-debug diff --git a/automation/scripts/qemu-smoke-ppc64le.sh b/automation/scripts/qemu-smoke-ppc64le.sh index 701d81107d18..9088881b731b 100755 --- a/automation/scripts/qemu-smoke-ppc64le.sh +++ b/automation/scripts/qemu-smoke-ppc64le.sh @@ -12,8 +12,8 @@ rm -f ${serial_log} set +e timeout -k 1 20 \ -binaries/qemu-system-ppc64 \ - -bios binaries/skiboot.lid \ +qemu-system-ppc64 \ + -bios skiboot.lid \ -M $machine \ -m 2g \ -smp 1 \ diff --git a/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile deleted file mode 100644 index e28d68649239..000000000000 --- a/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 debian:bullseye-slim -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV QEMU_VERSION=8.1.0 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - curl \ - python3 \ - python3-pip \ - python3-elementpath \ - ninja-build \ - pkg-config \ - libglib2.0-dev \ - libpixman-1-dev \ - && \ - \ - curl -fsSLO https://download.qemu.org/qemu-"$QEMU_VERSION".tar.xz && \ - tar xvJf qemu-"$QEMU_VERSION".tar.xz && \ - cd qemu-"$QEMU_VERSION" && \ - ./configure --target-list=ppc64-softmmu && \ - make -j$(nproc) && \ - cp ./build/qemu-system-ppc64 / && \ - cp ./build/qemu-bundle/usr/local/share/qemu/skiboot.lid / && \ - cd /build && \ - rm -rf qemu-"$QEMU_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* From patchwork Thu Jul 11 11:15:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13730471 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 D8207C3DA4A for ; Thu, 11 Jul 2024 11:15:46 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757331.1166243 (Exim 4.92) (envelope-from ) id 1sRrlx-0001f2-Hk; Thu, 11 Jul 2024 11:15:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757331.1166243; Thu, 11 Jul 2024 11:15:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlx-0001eB-8r; Thu, 11 Jul 2024 11:15:37 +0000 Received: by outflank-mailman (input) for mailman id 757331; Thu, 11 Jul 2024 11:15:36 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlw-0007rD-NZ for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 11:15:36 +0000 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [2a00:1450:4864:20::62a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e5704b61-3f76-11ef-bbfb-fd08da9f4363; Thu, 11 Jul 2024 13:15:36 +0200 (CEST) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a797c62565aso85395966b.2 for ; Thu, 11 Jul 2024 04:15:36 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7ff7d5sm246386666b.142.2024.07.11.04.15.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 04:15:33 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e5704b61-3f76-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720696535; x=1721301335; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J1K5VtaPNhxunkEsliC4eDIJIZHlapEJxDQkRvmcxLs=; b=pXUpUeuHQgexaSFUDc2Cim4UX8FPHBiiMHfonhjLfRxWGKPy9Vsg2iCQuMoESLBQpF bX3T0OvaxUu2sEmEb+Jhy2U8slS7S48mJMQ5I4JdW/LkmRqGDzv0Tt8IwpdpK7H4ygLk l8/nShu3TkDxnCuJbNyT2KebyB+tif3qkKzvI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720696535; x=1721301335; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J1K5VtaPNhxunkEsliC4eDIJIZHlapEJxDQkRvmcxLs=; b=UL0wYO6+S9uJXJ5PCAxOqKBWE8qJlolfcGdXzB0aPeNLHtxAjwcz0LmHPq+vUp7QqD +uYuTP6XcVNGuwfjK/b/yVmi2AqJa8eLwqm2kLKpBS/+iEtPRIK3vC1H6iuR5cY1WkGV Q37kpgxEjazW3wG4E0QwD3rzKWM03NRjQnMnnL7cfs0R9U6yYNFGAQtoMV1j4La5iQs1 +lJzRsoH2/1LTqOaF9lv1/dqGzls1rhvvjALnhQ85i4CQ9GfhEvyPsmzwmBKAit84mjg SWiNuwMbahlktZ+hOsVuxvdyq7LVe4FSGNlquUtWH43XR4BcUgBlgGdTRz1kKa1WHp2l Pyjw== X-Gm-Message-State: AOJu0YzmrVuCUj+gqWCqz1AmS2tcYDmRQzCohzVkL9AcGP4JYCeFmn3C nOQgCAiYBCLtvQxfTPN8sYL+Wn8wcj62YcPzKETZnOZ/dIQSgocO/0X0wQo/9mT+PbNu9uNBM62 R X-Google-Smtp-Source: AGHT+IFqyNl92G3n15wNOOj5JNaGHK+GM4H6qlZ9spenU3XWIEK3ierhsCZw7bUPzFW3Lh2dEtqEJQ== X-Received: by 2002:a17:906:c319:b0:a77:c5a5:f652 with SMTP id a640c23a62f3a-a780b6b308bmr503072966b.26.1720696535184; Thu, 11 Jul 2024 04:15:35 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 09/12] CI: Refresh bullseye-ppc64le as debian:11-ppc64le Date: Thu, 11 Jul 2024 12:15:14 +0100 Message-Id: <20240711111517.3064810-10-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 ... in the style of bookworm-ppc64le Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- automation/build/debian/11-ppc64le.dockerfile | 33 +++++++++++++++++++ .../build/debian/bullseye-ppc64le.dockerfile | 32 ------------------ automation/gitlab-ci/build.yaml | 8 ++--- automation/scripts/containerize | 2 +- 4 files changed, 38 insertions(+), 37 deletions(-) create mode 100644 automation/build/debian/11-ppc64le.dockerfile delete mode 100644 automation/build/debian/bullseye-ppc64le.dockerfile diff --git a/automation/build/debian/11-ppc64le.dockerfile b/automation/build/debian/11-ppc64le.dockerfile new file mode 100644 index 000000000000..d846b670d02c --- /dev/null +++ b/automation/build/debian/11-ppc64le.dockerfile @@ -0,0 +1,33 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 debian:bullseye-slim +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV CROSS_COMPILE=powerpc64le-linux-gnu- +ENV XEN_TARGET_ARCH=ppc64 + +RUN < X-Patchwork-Id: 13730472 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 3631DC3DA41 for ; Thu, 11 Jul 2024 11:15:47 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757332.1166257 (Exim 4.92) (envelope-from ) id 1sRrlz-0002EP-Lf; Thu, 11 Jul 2024 11:15:39 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757332.1166257; Thu, 11 Jul 2024 11:15:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlz-0002E6-Hh; Thu, 11 Jul 2024 11:15:39 +0000 Received: by outflank-mailman (input) for mailman id 757332; Thu, 11 Jul 2024 11:15:38 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlx-0007rD-WE for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 11:15:38 +0000 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [2a00:1450:4864:20::130]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e64191d0-3f76-11ef-bbfb-fd08da9f4363; Thu, 11 Jul 2024 13:15:37 +0200 (CEST) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-52ea7bdde68so872292e87.0 for ; Thu, 11 Jul 2024 04:15:37 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7ff7d5sm246386666b.142.2024.07.11.04.15.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 04:15:35 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e64191d0-3f76-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720696536; x=1721301336; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cbVg7w4alkvOoQ5s2c/0B5pTZEicSWylHq2BvrumP6Q=; b=GrWkvRWJkeHSTlr/sILTkHjDVr423aI4b7i4xBBb+VRMEWRnyQm1SNKP6UDFaCQMhT PPdjk23cGOz816ACWtTY76j+B4zhYwEX0TFuJ5YsYD0oCfFh4nK7sUmWxB2HHfQ6seBl Q9bob53f57kKnoIHDrgM4chsVaSKuCX8ufnA4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720696536; x=1721301336; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cbVg7w4alkvOoQ5s2c/0B5pTZEicSWylHq2BvrumP6Q=; b=T2N32k9mBvsNY7tQ09vijgy8e7ulqWQFRucQ5Um5lEeASu3F3aGzK4Ig6ag5VSC0lV 4O70JvL0tNxOeWUadMxYt9k/bnlNbRRytmAJjQ4ur3AJtcr+dJlCp3dtafBHppFrkrw/ hTlPP/EDr/zSjcHPuR6Cbr6tpsTjYZJBuCdm5nzClTFD4hHH7udjz8oivgiPeAacZu8Y 5202CdgnFIWXmklYjCkyOCS1wzpArlv4W9oB7WxsjtRXzF5N8sR7gvfbAqYFHunWZsvC X9GtKdt+vVLolCpEGa/YwfR0Oo46No0haHMNjyRbqEnIwUL1E/24dnJoZsf0cdfAopKi o78w== X-Gm-Message-State: AOJu0Yy1WgCZC2M11UDb1Ckk1EzTGlXI6MTFenCT+MPCwLAtY8VycWf2 EiMHxJF/TljArcAnxub1fGbUOlUZaTWuMgZ+TfDt590DBIff46PH1BDwOHmkSdALrOT48klChoo u X-Google-Smtp-Source: AGHT+IEL4NyFSqGSNl8loq9qRYBr5SimlEEEgEkOozgj694FlwWQ/JTAUZD3wSHsANGFzjuohj8PyQ== X-Received: by 2002:a05:6512:4016:b0:52c:e3ad:3fbf with SMTP id 2adb3069b0e04-52eb99d16aamr6026096e87.42.1720696536562; Thu, 11 Jul 2024 04:15:36 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 10/12] CI: Introduce debian:11/12-riscv64 containers Date: Thu, 11 Jul 2024 12:15:15 +0100 Message-Id: <20240711111517.3064810-11-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 For starters, they're slightly smaller: $ docker image list registry.gitlab.com/xen-project/xen/debian 12-riscv64 772MB registry.gitlab.com/xen-project/xen/debian 11-riscv64 422MB registry.gitlab.com/xen-project/xen/archlinux current-riscv64 2.32GB They also not rolling distros, so will be more predicatable testing for the stable trees in the future. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- automation/build/debian/11-riscv64.dockerfile | 33 +++++++++++++++++ automation/build/debian/12-riscv64.dockerfile | 36 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 automation/build/debian/11-riscv64.dockerfile create mode 100644 automation/build/debian/12-riscv64.dockerfile diff --git a/automation/build/debian/11-riscv64.dockerfile b/automation/build/debian/11-riscv64.dockerfile new file mode 100644 index 000000000000..1c99bc89ea1a --- /dev/null +++ b/automation/build/debian/11-riscv64.dockerfile @@ -0,0 +1,33 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 debian:bullseye-slim +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV CROSS_COMPILE=riscv64-linux-gnu- +ENV XEN_TARGET_ARCH=riscv64 + +RUN < X-Patchwork-Id: 13730474 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 1610EC3DA41 for ; Thu, 11 Jul 2024 11:15:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757333.1166266 (Exim 4.92) (envelope-from ) id 1sRrm2-0002eA-Bt; Thu, 11 Jul 2024 11:15:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757333.1166266; Thu, 11 Jul 2024 11:15:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrm2-0002dB-0D; Thu, 11 Jul 2024 11:15:42 +0000 Received: by outflank-mailman (input) for mailman id 757333; Thu, 11 Jul 2024 11:15:40 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrlz-0007rD-Ur for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 11:15:39 +0000 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [2a00:1450:4864:20::62e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e745a80c-3f76-11ef-bbfb-fd08da9f4363; Thu, 11 Jul 2024 13:15:39 +0200 (CEST) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a77e5929033so110996866b.0 for ; Thu, 11 Jul 2024 04:15:39 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7ff7d5sm246386666b.142.2024.07.11.04.15.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 04:15:36 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e745a80c-3f76-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720696538; x=1721301338; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/58JNO+Inrk9wj+NdeQQj6nZyBQF1LcNhJ0B6w0/d4Y=; b=Sonh6Fh1hD1yLaUP98DAVGAaDnxP6/43lYczFbB9hUU5POzbQz+tMXnDE4cUom/jqz XzMy5XoiVVRHgjdF5/h4NVVhIchCsbnmYUSpKPbZEp0TZPsY9ILz30JCCNzDNSf/SiSR m2MV+0Vp50W8f657h/Mv2Gn/J4PLm/ZZ5Jq1k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720696538; x=1721301338; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/58JNO+Inrk9wj+NdeQQj6nZyBQF1LcNhJ0B6w0/d4Y=; b=d0ZcigWPsgdBJbT8gCjDvmSnc3wwEfvAIvgi7J1UPom+cr5FC3vVWHO0THDZbzcpOj NFdansCvoAWl/iM0kkg/6f6p1Z519NOzkpYUR0TsepA1aiJpNQpbQfrTxW2muxHhJJaL xrprUnp4uN9PLWhRy61mw3sfSv+og9bdPHNtsOJUoKWWf2Jhel2z05LzQ++rpnEJtYQd R4T2VBhoj5VRdhCq0LhcKUduxyulDymi13GMtR26qSJsL7GEquL5KxZdf4IFE3dfNIkp CZQGvZz7l1RIcXaL6RiYLx3kodsDFH4bJY5cY9iQbCUlbtJu6N4Ad8dPA/vTttvjbl3Q hLlw== X-Gm-Message-State: AOJu0Yx8tJpr8h8vTkgxqNseLgQo45hWo/pq+YSrDlK45pOSXszsqvsN d5QUd2G4B3U0Nvru4eMaSX5inaAy14dK/6NlarYvuYUshFG9fMnr9JsX+H/XZGueSYn9p8tSzt5 4 X-Google-Smtp-Source: AGHT+IFUhjpe6I7SpkUuVRldLMGG9DNg5sTjpySDOkwmu/oP04WKHAaoix/XKfmfMefITqm1OqwgkQ== X-Received: by 2002:a17:906:1808:b0:a77:c96b:a113 with SMTP id a640c23a62f3a-a780b881c98mr515861566b.60.1720696538294; Thu, 11 Jul 2024 04:15:38 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 11/12] CI: Swap to debian for riscv64 build and test Date: Thu, 11 Jul 2024 12:15:16 +0100 Message-Id: <20240711111517.3064810-12-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 The containers are both much smaller, with stable toolchains over time, and this at least means we're not doing all testing with a single compiler. Rename the jobs to follow to sort coherently ($DISTRO-$VERSION-$ARCH-*) and reposition the jobs to optimise starting the smoke test. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- .../archlinux/current-riscv64.dockerfile | 22 ----- automation/gitlab-ci/build.yaml | 83 +++++++++++-------- automation/gitlab-ci/test.yaml | 4 +- automation/scripts/containerize | 3 +- 4 files changed, 52 insertions(+), 60 deletions(-) delete mode 100644 automation/build/archlinux/current-riscv64.dockerfile diff --git a/automation/build/archlinux/current-riscv64.dockerfile b/automation/build/archlinux/current-riscv64.dockerfile deleted file mode 100644 index f7770bf82a78..000000000000 --- a/automation/build/archlinux/current-riscv64.dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 archlinux -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -# Packages needed for the build -RUN pacman --noconfirm --needed -Syu \ - base-devel \ - git \ - inetutils \ - riscv64-linux-gnu-binutils \ - riscv64-linux-gnu-gcc \ - riscv64-linux-gnu-glibc \ - # For test phase - qemu-system-riscv - -# Add compiler path -ENV CROSS_COMPILE=riscv64-linux-gnu- - -RUN useradd --create-home user -USER user -WORKDIR /build diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index e081664c4e95..4b9d80cc5632 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -357,6 +357,13 @@ debian-12-ppc64le-gcc-debug: KBUILD_DEFCONFIG: ppc64_defconfig HYPERVISOR_ONLY: y +debian-12-riscv64-gcc-debug: + extends: .gcc-riscv64-cross-build-debug + variables: + CONTAINER: debian:12-riscv64 + KBUILD_DEFCONFIG: tiny64_defconfig + HYPERVISOR_ONLY: y + # Arm32 cross-build debian-bookworm-gcc-arm32: @@ -458,41 +465,6 @@ alpine-3.18-gcc-debug-arm64-earlyprintk: CONFIG_EARLY_UART_CHOICE_PL011=y CONFIG_EARLY_UART_BASE_ADDRESS=0x9000000 -# RISC-V 64 cross-build -.riscv-fixed-randconfig: - variables: &riscv-fixed-randconfig - EXTRA_FIXED_RANDCONFIG: | - CONFIG_BOOT_TIME_CPUPOOLS=n - CONFIG_COVERAGE=n - CONFIG_EXPERT=y - CONFIG_GRANT_TABLE=n - CONFIG_MEM_ACCESS=n - CONFIG_PERF_COUNTERS=n - CONFIG_LIVEPATCH=n - CONFIG_XSM=n - -archlinux-current-gcc-riscv64: - extends: .gcc-riscv64-cross-build - variables: - CONTAINER: archlinux:current-riscv64 - KBUILD_DEFCONFIG: tiny64_defconfig - HYPERVISOR_ONLY: y - -archlinux-current-gcc-riscv64-debug: - extends: .gcc-riscv64-cross-build-debug - variables: - CONTAINER: archlinux:current-riscv64 - KBUILD_DEFCONFIG: tiny64_defconfig - HYPERVISOR_ONLY: y - -archlinux-current-gcc-riscv64-randconfig: - extends: .gcc-riscv64-cross-build - variables: - CONTAINER: archlinux:current-riscv64 - KBUILD_DEFCONFIG: tiny64_defconfig - RANDCONFIG: y - <<: *riscv-fixed-randconfig - # Yocto test jobs yocto-qemuarm64: extends: .yocto-test-arm64 @@ -739,3 +711,44 @@ debian-12-ppc64le-gcc: KBUILD_DEFCONFIG: ppc64_defconfig HYPERVISOR_ONLY: y +# RISC-V 64 cross-build +debian-11-riscv64-gcc: + extends: .gcc-riscv64-cross-build + variables: + CONTAINER: debian:11-riscv64 + KBUILD_DEFCONFIG: tiny64_defconfig + HYPERVISOR_ONLY: y + +debian-11-riscv64-gcc-debug: + extends: .gcc-riscv64-cross-build-debug + variables: + CONTAINER: debian:11-riscv64 + KBUILD_DEFCONFIG: tiny64_defconfig + HYPERVISOR_ONLY: y + +debian-12-riscv64-gcc: + extends: .gcc-riscv64-cross-build + variables: + CONTAINER: debian:12-riscv64 + KBUILD_DEFCONFIG: tiny64_defconfig + HYPERVISOR_ONLY: y + +.riscv-fixed-randconfig: + variables: &riscv-fixed-randconfig + EXTRA_FIXED_RANDCONFIG: | + CONFIG_BOOT_TIME_CPUPOOLS=n + CONFIG_COVERAGE=n + CONFIG_EXPERT=y + CONFIG_GRANT_TABLE=n + CONFIG_MEM_ACCESS=n + CONFIG_PERF_COUNTERS=n + CONFIG_LIVEPATCH=n + CONFIG_XSM=n + +debian-12-riscv64-gcc-randconfig: + extends: .gcc-riscv64-cross-build + variables: + CONTAINER: debian:12-riscv64 + KBUILD_DEFCONFIG: tiny64_defconfig + RANDCONFIG: y + <<: *riscv-fixed-randconfig diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 70c946f87799..f7e1753ead34 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -56,7 +56,7 @@ .qemu-riscv64: extends: .test-jobs-common variables: - CONTAINER: archlinux:current-riscv64 + CONTAINER: debian:12 LOGFILE: qemu-smoke-riscv64.log artifacts: paths: @@ -440,7 +440,7 @@ qemu-smoke-riscv64-gcc: script: - ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE} needs: - - archlinux-current-gcc-riscv64-debug + - debian-12-riscv64-gcc-debug qemu-smoke-ppc64le-powernv9-gcc: extends: .qemu-ppc64le diff --git a/automation/scripts/containerize b/automation/scripts/containerize index 5c3f6782d9cd..6dbf55c8f89a 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -27,12 +27,13 @@ case "_${CONTAINER}" in _alpine) CONTAINER="${BASE}/alpine:3.18" ;; _alpine-arm64v8) CONTAINER="${BASE}/alpine:3.18-arm64v8" ;; _archlinux|_arch) CONTAINER="${BASE}/archlinux:current" ;; - _riscv64) CONTAINER="${BASE}/archlinux:current-riscv64" ;; _centos7) CONTAINER="${BASE}/centos:7" ;; _fedora) CONTAINER="${BASE}/fedora:29";; _focal) CONTAINER="${BASE}/ubuntu:focal" ;; _bullseye-ppc64le) CONTAINER="${BASE}/debian:11-ppc64le" ;; _bookworm-ppc64le) CONTAINER="${BASE}/debian:12-ppc64le" ;; + _bullseye-riscv64) CONTAINER="${BASE}/debian:11-riscv64" ;; + _bookworm-riscv64) CONTAINER="${BASE}/debian:12-riscv64" ;; _buster-gcc-ibt) CONTAINER="${BASE}/debian:buster-gcc-ibt" ;; _bookworm|_) CONTAINER="${BASE}/debian:bookworm" ;; _bookworm-i386) CONTAINER="${BASE}/debian:bookworm-i386" ;; From patchwork Thu Jul 11 11:15:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13730475 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 4326DC41513 for ; Thu, 11 Jul 2024 11:15:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757334.1166276 (Exim 4.92) (envelope-from ) id 1sRrm3-0002vv-QS; Thu, 11 Jul 2024 11:15:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757334.1166276; Thu, 11 Jul 2024 11:15:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrm3-0002vV-Mn; Thu, 11 Jul 2024 11:15:43 +0000 Received: by outflank-mailman (input) for mailman id 757334; Thu, 11 Jul 2024 11:15:42 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sRrm2-0007rJ-1b for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 11:15:42 +0000 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [2a00:1450:4864:20::629]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e80b69f7-3f76-11ef-8776-851b0ebba9a2; Thu, 11 Jul 2024 13:15:40 +0200 (CEST) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a77d9217e6fso99243166b.2 for ; Thu, 11 Jul 2024 04:15:40 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a7ff7d5sm246386666b.142.2024.07.11.04.15.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 04:15:38 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e80b69f7-3f76-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720696539; x=1721301339; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OC0NczTz0Vex9AArMEqFVcwewes4uJlfc6tJ7aYcqpE=; b=Qwip5gJKIFj5a7PCdx2YUUyuphZttosFqHo8Oq8w3jYuqh3hOS0NDdpgJQpenqtRFw D+6wn8H5T4i++F9s2ddXaC4dy0EijbBzsn/6yJ6D18Vga70ADHjBSHJcuOEPNQP6eTzu l+YHHvXal1suty3DfqhVbOaP/a4OjE+5PiEDU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720696539; x=1721301339; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OC0NczTz0Vex9AArMEqFVcwewes4uJlfc6tJ7aYcqpE=; b=YWBddFxmx/gRaCi1JFEf8hy+D/lD6QWzgmChSp0Mc5JVT4q2MN1sQHK2JM2ESEukvs u42vhsPiIbvANKWdgJv1tX/qK17F8sOgStmqBsqxjD3L88DcwI7lqLEeRMIMowGGEb9n /1ZySENz3ePul7vnLPHEXJoS4RWkMN/77kaTg+9P4+NMsLvfOW03qxPExIV5FNyB7ejf 9B6X/i0tKwAIjYeKVAWalYP8c8tFv4sDPLfvzQwO169BXUJmw0llR5D4hIlEIC5QtO+j 7+kjOtkO/KJs0nnDuJ7geVVCPE6xkSrOcW88vRmh9URowSrwwXE4A1g9UAd+ick1Ro/g 4+EQ== X-Gm-Message-State: AOJu0Yzl6lEfZ2FtIoHzNBlK7p346NweODaXPF4M9YO6NXwZfDgddirq efF645hjmn51rJd4902dAegKL3xY1G/K1HoGSrDHC8qQdjdiUXw0x0sQVEjczhEATwEBUVk/Oa3 Q X-Google-Smtp-Source: AGHT+IGzueVYQrd+84hpYvuyG/HPwMgW2Wl89zcTITEe9G0q0UUak58I4GmnP+NOvk9hpoUxDiq4RQ== X-Received: by 2002:a17:906:a848:b0:a77:e2e3:355f with SMTP id a640c23a62f3a-a780b7051f2mr465011966b.41.1720696539578; Thu, 11 Jul 2024 04:15:39 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 12/12] CI: Refresh and upgrade the GCC-IBT container Date: Thu, 11 Jul 2024 12:15:17 +0100 Message-Id: <20240711111517.3064810-13-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Upgrade from Debian buster to bookworm, GCC 11.3 to 11.4 and to be a non-root container. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- ...ockerfile => 12-x86_64-gcc-ibt.dockerfile} | 81 +++++++++++-------- automation/gitlab-ci/build.yaml | 4 +- automation/scripts/containerize | 2 +- 3 files changed, 49 insertions(+), 38 deletions(-) rename automation/build/debian/{buster-gcc-ibt.dockerfile => 12-x86_64-gcc-ibt.dockerfile} (50%) diff --git a/automation/build/debian/buster-gcc-ibt.dockerfile b/automation/build/debian/12-x86_64-gcc-ibt.dockerfile similarity index 50% rename from automation/build/debian/buster-gcc-ibt.dockerfile rename to automation/build/debian/12-x86_64-gcc-ibt.dockerfile index ed9367aafbec..3ce60e7d9466 100644 --- a/automation/build/debian/buster-gcc-ibt.dockerfile +++ b/automation/build/debian/12-x86_64-gcc-ibt.dockerfile @@ -1,28 +1,33 @@ # syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 debian:buster-slim AS builder +FROM --platform=linux/amd64 debian:bookworm-slim AS builder ENV DEBIAN_FRONTEND=noninteractive -ENV USER root -RUN apt-get update && \ - apt-get --quiet --yes --no-install-recommends install \ - bison \ - build-essential \ - ca-certificates \ - flex \ - g++-multilib \ - libc6-dev-i386 \ - libgmp-dev \ - libisl-dev \ - libmpc-dev \ - libmpfr-dev \ - patch \ +RUN < X-Patchwork-Id: 13731051 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 C995BC3DA4A for ; Thu, 11 Jul 2024 20:24:10 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757684.1166787 (Exim 4.92) (envelope-from ) id 1sS0KS-0005ra-JP; Thu, 11 Jul 2024 20:23:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757684.1166787; Thu, 11 Jul 2024 20:23:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sS0KS-0005rT-Gu; Thu, 11 Jul 2024 20:23:48 +0000 Received: by outflank-mailman (input) for mailman id 757684; Thu, 11 Jul 2024 20:23:46 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sS0KQ-0005rN-Ko for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 20:23:46 +0000 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [2a00:1450:4864:20::62b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 774a605c-3fc3-11ef-8776-851b0ebba9a2; Thu, 11 Jul 2024 22:23:42 +0200 (CEST) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a77d9217e6fso176226866b.2 for ; Thu, 11 Jul 2024 13:23:42 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6dfb19sm284302966b.66.2024.07.11.13.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 13:23:40 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 774a605c-3fc3-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720729421; x=1721334221; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IpVMbtAPh/d/2PPbAwt7r6y7YPmwonQerNDnIDQpg6I=; b=N7+fOPIYefy1KC59GTFPIKgk0ZYX5vae+kY8LsynKgqmuXBt01Whv9ZOix8k8KezGU B5EnMDoZsmr159vNRXPEfyXglinojjmIbPJLpTq9lcEWU4o1kq5wgrX7RaWDyaT257ab JbFyAYTjb8I/Rgls+3vLPWgZtu5bmZPexWisM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720729421; x=1721334221; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IpVMbtAPh/d/2PPbAwt7r6y7YPmwonQerNDnIDQpg6I=; b=A0IMk1WPLvj6dNw5mTC7+cPOjP0dR6SUFZOK8Azo6zMrH3CzvM8lIfEjktn3CBVpRd o+rBWm4y76g9MelibTVF8GybGbp0MW/QNHpqZ3087u4PuxSIRndeXivr+mWIgZslf7ll 0xKJ+yGnBJiVFgdJVh35z0OAemsNxyrHmEMUxokx2X14YOLgPZUGq2ESShVujYGgtrjo jwHTy9187qwp4InLCduf9PmwM42F8LvrIANDqoDwFT/QCgWsnEn9bIp6MJ5gBSMZ3BQz QeLsv17PEtjiMDublN66qecbNTXLDLkJHPa9dfuFwxFGkKBvPFMEFSopwf99F6dtRpo9 8ZZw== X-Gm-Message-State: AOJu0Yw9ZaYVtP4dxc1Ia/lLNBcEtMducTN55aQpeMTSHtO516bTJJNZ 4d/yHp7ykgBwGibLzOjQ/OuVPS5aQTgCRw/GFyUjbyI2xkedmIuKkTrSrLMh03wnn4OWr3ffH4O h X-Google-Smtp-Source: AGHT+IH88DM9Q4+KiHpA5R5Wpx11Z3bFn+wtvU/J/FuiR8zygZ3LCnYQIX0arYYtaqDGyqaKVcS8ug== X-Received: by 2002:a17:906:39d6:b0:a72:9963:eb8e with SMTP id a640c23a62f3a-a780b6b307emr492899766b.28.1720729421544; Thu, 11 Jul 2024 13:23:41 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio , Olaf Hering Subject: [PATCH 13/12] CI: Refresh OpenSUSE Tumbleweed container Date: Thu, 11 Jul 2024 21:23:37 +0100 Message-Id: <20240711202337.3128473-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Existing as suse:opensuse-tumbleweed is a historical quirk, and adjusted for consistency with all the other containers. Make it non-root, use heredocs for legibility, and use the zypper long names for the benefit of those wondering what was being referenced or duplicated. Trim the dependencies substantially. Testing docs isn't very interesting and saves a lot of space (pandoc pulls in all of Haskel). Other savings come from removing a huge pile of optional QEMU dependencies (QEMU just needs to build the Xen parts to be useful here, not have a full GUI environment). Finally, there where some packages such as bc, libssh2-devel, libtasn1-devel and nasm that I'm not aware of any reason to have had, even historically. This shaves 1G off the size of the container: registry.gitlab.com/xen-project/xen/opensuse tumbleweed-x86_64 1.39GB registry.gitlab.com/xen-project/xen/suse opensuse-tumbleweed 2.35GB Furthermore, identify which components of the build use which dependencies, which will help managing them in the future. Thanks to Olaf Hering for dependency fixes that have been subsumed into this total overhaul. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio CC: Olaf Hering This includes both of Olaf's recent changes, python3-packaging (now required for a rebuilt container), and findutils (not required yet; still gets pulled in transitively), but added for good measure. In terms of package delta, newly included are: findutils # As suggested ocaml-findlib # Replaces ocaml-findlib-devel perl # Transitive previously python3 # Transitive previously python3-packaging # As suggested while removed are: bc # ? cmake # vtpm stubdom, optional discount # docs ghostscript # docs glibc-devel # Not really optional, given a toolchain hostname # Optional, not interesting libaio-devel # Xen < 4.13, perhaps Qemu still but optional libext2fs-devel # Libfsimage, off by default, optional libgnutls-devel # Qemu ? libjpeg62-devel # Qemu ? libnl3-devel # Libxl COLO(?), option libnuma-devel # ? libpng16-devel # Qemu ? libssh2-devel # ? libtasn1-devel # ? nasm # ? ocaml-findlib-devel # Swapped for non-devel ocaml-ocamlbuild # ? ocaml-ocamldoc # ? pandoc # docs 'pkgconfig(libpci)' # Qemu 'pkgconfig(sdl)' # Qemu 'pkgconfig(sdl2)' # Qemu systemd-devel # Xen < 4.19, optional transfig # docs valgrind-devel # really only for developers which # Xen < 4.17 I've tested this on staging-4.17 and staging, both of which build fine. staging-4.16 does not, because of SeaBIOS which we've decided not to fix, hence it's safe to drop `which`. --- .../opensuse/tumbleweed-x86_64.dockerfile | 76 +++++++++++++++++++ .../build/suse/opensuse-tumbleweed.dockerfile | 74 ------------------ automation/gitlab-ci/build.yaml | 8 +- automation/scripts/containerize | 2 +- 4 files changed, 81 insertions(+), 79 deletions(-) create mode 100644 automation/build/opensuse/tumbleweed-x86_64.dockerfile delete mode 100644 automation/build/suse/opensuse-tumbleweed.dockerfile diff --git a/automation/build/opensuse/tumbleweed-x86_64.dockerfile b/automation/build/opensuse/tumbleweed-x86_64.dockerfile new file mode 100644 index 000000000000..8c5ff56cdc88 --- /dev/null +++ b/automation/build/opensuse/tumbleweed-x86_64.dockerfile @@ -0,0 +1,76 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 opensuse/tumbleweed +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV XEN_TARGET_ARCH=x86_64 + +RUN < X-Patchwork-Id: 13731058 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 AB9C1C3DA4A for ; Thu, 11 Jul 2024 21:05:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757703.1166818 (Exim 4.92) (envelope-from ) id 1sS0z0-0003kP-BM; Thu, 11 Jul 2024 21:05:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757703.1166818; Thu, 11 Jul 2024 21:05:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sS0z0-0003kI-8j; Thu, 11 Jul 2024 21:05:42 +0000 Received: by outflank-mailman (input) for mailman id 757703; Thu, 11 Jul 2024 21:05:41 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sS0yz-0003kC-3c for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 21:05:41 +0000 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [2a00:1450:4864:20::52e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 53715a3d-3fc9-11ef-bbfb-fd08da9f4363; Thu, 11 Jul 2024 23:05:39 +0200 (CEST) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-58ba3e37feeso1619107a12.3 for ; Thu, 11 Jul 2024 14:05:40 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-594bc3f29d2sm3858602a12.41.2024.07.11.14.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 14:05:38 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 53715a3d-3fc9-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720731939; x=1721336739; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hIJUjPuUxWvZ2Xd5AJQXA1yC+F0y1g/OHIYvnMwTMu8=; b=Et4sqDPVtaDDYIjm2X4tz04ueF2JntX3LGw+QhfrWuRoz4R4x86ep8cnRvkGfuvxTJ beoOJiymBcTwadY+D3/J3TWxKobCg7G4cwkkaZUJ27qaa/FtxdJCbPHOa30o28B9nnzk h8ryXXtrIug59CMzJEEwye2tzcjF35KJVhcNs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720731939; x=1721336739; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hIJUjPuUxWvZ2Xd5AJQXA1yC+F0y1g/OHIYvnMwTMu8=; b=KFaHRQpR4RULpPP9ojvbmMme6wA9vR7u6quxOEuJ/dUTXkplOlXnD/AQ1CToCJSztd pqptHqrGSq9SiKUotDGTG+ybOY6JkygqUyPaYIi6jpzqGgzP9O937iIew++/0W6g8Ong qTTGyWSm+CaJbq5bO1yDwq1xLPXysEV75H9Tb30PP98eFmei8ARhb1Gv1zpX9e9YX6N+ 2rj2PZu2wBnJxT89zbYlRU1b22Z7xKPYRPIHg1DyzEEwHEZmaK5S4CTECODxP8YXsJWO Nn6krtCRlZu/iLh+gZW+1w11ZzZuvhsLyqeXhOyz/cBuvGf7cmQkwaG3l0wCLunXaViV 4Mig== X-Gm-Message-State: AOJu0Ywn4qNlTDh/PtoRRv5cWbGOAj6rAp19z+xt9cS0prbCuw7VEHtT 3FMIXDmQH7cd+gooHBgPmpfPQB6AhcMSx00klKKlaGht68se28XlrhJ9oWhmVK4ecTwDxMhYatn j X-Google-Smtp-Source: AGHT+IFWfZB2wCIe/k8b0kZ7imY/ZivkWYO0JHQ/rCmwAl2cjlOjCvwlwaEB1pHaHdZA09MTaBx43A== X-Received: by 2002:a05:6402:430b:b0:586:6365:b3cf with SMTP id 4fb4d7f45d1cf-594baf8728amr6846038a12.10.1720731938642; Thu, 11 Jul 2024 14:05:38 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio , Olaf Hering Subject: [PATCH 14/12] CI: Refresh OpenSUSE Leap container Date: Thu, 11 Jul 2024 22:05:34 +0100 Message-Id: <20240711210534.3141725-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 See prior patch for most discussion. Despite appearing to a fixed release (and therefore not marked as permitted failure), the dockerfile references the `leap` tag which is rolling in practice. Switch to 15.6 explicitly, for better test stability. Vs tumbleweed, use `zypper update` rather than dist-upgrade, and retain the RomBIOS dependencies; bin86 and dev86. In terms of size, this saves ~700M: registry.gitlab.com/xen-project/xen/opensuse leap-15.6-x86_64 1.33GB registry.gitlab.com/xen-project/xen/suse opensuse-leap 2.05GB Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio CC: Olaf Hering Runs with this new container: 4.19: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/7322493460 4.16: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/7322499881 --- .../opensuse/leap-15.6-x86_64.dockerfile | 79 +++++++++++++++++++ .../build/suse/opensuse-leap.dockerfile | 75 ------------------ automation/gitlab-ci/build.yaml | 16 ++-- automation/scripts/containerize | 2 +- 4 files changed, 88 insertions(+), 84 deletions(-) create mode 100644 automation/build/opensuse/leap-15.6-x86_64.dockerfile delete mode 100644 automation/build/suse/opensuse-leap.dockerfile diff --git a/automation/build/opensuse/leap-15.6-x86_64.dockerfile b/automation/build/opensuse/leap-15.6-x86_64.dockerfile new file mode 100644 index 000000000000..562006672a4e --- /dev/null +++ b/automation/build/opensuse/leap-15.6-x86_64.dockerfile @@ -0,0 +1,79 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 opensuse/leap:15.6 +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV XEN_TARGET_ARCH=x86_64 + +RUN < X-Patchwork-Id: 13731602 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 9D017C2BD09 for ; Fri, 12 Jul 2024 10:48:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757877.1167026 (Exim 4.92) (envelope-from ) id 1sSDpM-0005qG-H9; Fri, 12 Jul 2024 10:48:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757877.1167026; Fri, 12 Jul 2024 10:48:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sSDpM-0005q9-EP; Fri, 12 Jul 2024 10:48:36 +0000 Received: by outflank-mailman (input) for mailman id 757877; Fri, 12 Jul 2024 10:48:35 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sSDpL-0005q3-Lq for xen-devel@lists.xenproject.org; Fri, 12 Jul 2024 10:48:35 +0000 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [2a00:1450:4864:20::536]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 49478e4b-403c-11ef-bbfb-fd08da9f4363; Fri, 12 Jul 2024 12:48:34 +0200 (CEST) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-58b447c5112so2591394a12.3 for ; Fri, 12 Jul 2024 03:48:34 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-594bc4e819bsm4445410a12.51.2024.07.12.03.48.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 03:48:32 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 49478e4b-403c-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720781313; x=1721386113; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j3Y1QM2aDjAbMbU+9PSSN+1sK9TzRRFdE1CnKXuZCwU=; b=TzXx48jMJngvqtaEoXO82TWDdmRcDbviyPXT90DTABeMS1ij9JV8YG8SqEVtIZYZ9/ wJGYtr03pWSBKkP7+gH5smNPw//6qm3JILtos+Md2ht1Vhg7SccM+7KgdfbFdK0NsNqg N/cDztxZkqzV6RC9+pTqh4GdCY7DutEBVGPRU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720781313; x=1721386113; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j3Y1QM2aDjAbMbU+9PSSN+1sK9TzRRFdE1CnKXuZCwU=; b=ojAItrotV8uFI8gaY9o9yckZa8Zi2DzurLH2zWoSb+4UIfk6hhIIaLQLMK3oYoJBHA D8TZPh3+9rGVbop+BYRkIT06yaY0jkZeBljEKIZ9DlMFr0V13NuGCVoBsZcHYumUyh0G LObLJYP6t6zKrDds0YADE7pgtxUYJqy2sV/zOmpLTlZZSAc6s210K8LXM88HTZgCngn/ 0g0xSAbHcJjhp+CU9yfEqRXwYo+BKmMOB81pISc/9w1OutHInlW55BaT5d2gx4wgHfXx nBbWGyxalkWIEHzoCVIYXxxfwtDHxrjgTtzaSajcCVfYBJTv0SgVzGOPC6FAHh3/VLeS lDwQ== X-Gm-Message-State: AOJu0YypxVFL6UVFbeGN/M06HhNsJamBAD0+uGbTVKXZa8FPTARPcUS5 hNo+Y25ISOywJUvqbkfR40zsmvCLbqV0WXfsxWbwDw/NqWsvQNACAqTGdOH9dQ3j2ldTL4AuS5q B X-Google-Smtp-Source: AGHT+IFsK+GY3xofEr9bwn9DrDj8vHf0xZ7YawxDEqfYmH0MNyrIQQ1Jm0x+o4KOBZwXmjxJvpIg8Q== X-Received: by 2002:a05:6402:2791:b0:58d:115c:f529 with SMTP id 4fb4d7f45d1cf-594ba997550mr9016601a12.7.1720781312942; Fri, 12 Jul 2024 03:48:32 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 15/12] CI: Refresh Ubuntu Xenial container as 16.04-x86_64 Date: Fri, 12 Jul 2024 11:48:29 +0100 Message-Id: <20240712104829.3237296-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Rework the container to be non-root, use heredocs for legibility, and use use apt-get --no-install-recommends to keep the size down. Ubuntu Xenial has no ninja-build package, so can't build the QEMU referenced by Xen 4.16. Therefore, drop the dependencies too. This saves ~500M: registry.gitlab.com/xen-project/xen/ubuntu 16.04-x86_64 700MB registry.gitlab.com/xen-project/xen/ubuntu xenial 1.21GB Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio Runs with the new container: 4.16: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/7323548805 4.19: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/7323548805 --- .../build/ubuntu/16.04-x86_64.dockerfile | 65 +++++++++++++++++++ automation/build/ubuntu/xenial.dockerfile | 46 ------------- automation/gitlab-ci/build.yaml | 16 ++--- automation/scripts/containerize | 2 +- 4 files changed, 74 insertions(+), 55 deletions(-) create mode 100644 automation/build/ubuntu/16.04-x86_64.dockerfile delete mode 100644 automation/build/ubuntu/xenial.dockerfile diff --git a/automation/build/ubuntu/16.04-x86_64.dockerfile b/automation/build/ubuntu/16.04-x86_64.dockerfile new file mode 100644 index 000000000000..11e878050b83 --- /dev/null +++ b/automation/build/ubuntu/16.04-x86_64.dockerfile @@ -0,0 +1,65 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 ubuntu:16.04 +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive + +RUN < X-Patchwork-Id: 13731603 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 2E6C3C3DA4A for ; Fri, 12 Jul 2024 10:48:59 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757878.1167036 (Exim 4.92) (envelope-from ) id 1sSDpb-00069q-OM; Fri, 12 Jul 2024 10:48:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757878.1167036; Fri, 12 Jul 2024 10:48:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sSDpb-00069j-Li; Fri, 12 Jul 2024 10:48:51 +0000 Received: by outflank-mailman (input) for mailman id 757878; Fri, 12 Jul 2024 10:48:51 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sSDpb-00069W-4J for xen-devel@lists.xenproject.org; Fri, 12 Jul 2024 10:48:51 +0000 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [2a00:1450:4864:20::62b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 51fe03b8-403c-11ef-8776-851b0ebba9a2; Fri, 12 Jul 2024 12:48:49 +0200 (CEST) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a77e7a6cfa7so237708266b.1 for ; Fri, 12 Jul 2024 03:48:49 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6bd010sm336551666b.18.2024.07.12.03.48.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 03:48:47 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 51fe03b8-403c-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720781328; x=1721386128; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PZsyhlKpPKwJu0K89EuDjhZnuB3yQi1RNCGVeTYU+Wk=; b=fgcQi2ph05D19wLseN4UGtkoN3Qb1NIKZPlFO0scVa+0y3x6MvjXo43/k6HcQCsxni WzUi8K0GgmtG4dTGk140HbJqGJYxdYpqfLQE73ukI30KVdwMq7seGXvzDPwfG/qounE+ dsKSNWbyfeppY+BEJkQSkSRl3QqrJNtXNGIxc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720781328; x=1721386128; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PZsyhlKpPKwJu0K89EuDjhZnuB3yQi1RNCGVeTYU+Wk=; b=K3gjQyFGgmcqy+83f6XxeASx+jN2h6s9v82JLb7+MzAi1nV1rzt3MomOXnhsg1o5hQ 8JNFuG84Wja7Pcsvlrv0v8vDpvALxdj/Krb6bxWrbToGdp+eBWKjr7z0lQ1KFF943/D/ Fs5hkXACO3FqOgEgBQ+/PSpTPVomylcyia0/K1gkKNA6K3wE7VwTXgGn4lnG/iwg8BiN vJv2yXy/aRTdMpkG/msAo4HE7VqjNWs+GBGQrwRc1l3GLvZxrqaq1nhzsZGeLSwx/+Tz jBVToV+fBKb5UOgXB9vAGzAJJ9nBuJoKp+qJA/oW2UUcDq6AuS9YKJj6rQ1niCG3Vyun gYIQ== X-Gm-Message-State: AOJu0YxLxnN+PTtxopl6g3S52GiXZfJmj5lO7um17SH8uj6N5HMX1bBu LiORJOqD7iyWrXkK5DSKzgpHLvleKh/9sZkF2PJCUoHpJ9QxCFBpDEGV4dQLPM1OF2FKgRHcCdz R X-Google-Smtp-Source: AGHT+IE84WOvQj/BbutiRZNfCyOMp5XwqX7/KWYvuUB7Z1IRk7FsrRzQ6AHXAkvFvcVHfEOY1VPtPA== X-Received: by 2002:a17:906:c110:b0:a72:b055:3de0 with SMTP id a640c23a62f3a-a780b68a358mr973345566b.6.1720781328144; Fri, 12 Jul 2024 03:48:48 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 16/12] CI: Refresh Ubuntu Bionic container as 18.04-x86_64 Date: Fri, 12 Jul 2024 11:48:42 +0100 Message-Id: <20240712104842.3237603-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 As with 16.04 (Focal), except that ninja-build is available so QEMU can be built. This halves the size of the container: registry.gitlab.com/xen-project/xen/ubuntu 18.04-x86_64 860MB registry.gitlab.com/xen-project/xen/ubuntu bionic 1.44GB Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio Runs with the new container: 4.16: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/7323548809 4.19: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/7323516970 --- .../build/ubuntu/18.04-x86_64.dockerfile | 72 +++++++++++++++++++ automation/build/ubuntu/bionic.dockerfile | 48 ------------- automation/gitlab-ci/build.yaml | 16 ++--- automation/scripts/containerize | 2 +- 4 files changed, 81 insertions(+), 57 deletions(-) create mode 100644 automation/build/ubuntu/18.04-x86_64.dockerfile delete mode 100644 automation/build/ubuntu/bionic.dockerfile diff --git a/automation/build/ubuntu/18.04-x86_64.dockerfile b/automation/build/ubuntu/18.04-x86_64.dockerfile new file mode 100644 index 000000000000..24047e8f6ab2 --- /dev/null +++ b/automation/build/ubuntu/18.04-x86_64.dockerfile @@ -0,0 +1,72 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 ubuntu:18.04 +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive + +RUN < X-Patchwork-Id: 13731604 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 4524EC2BD09 for ; Fri, 12 Jul 2024 10:49:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757881.1167057 (Exim 4.92) (envelope-from ) id 1sSDpn-0006qT-BK; Fri, 12 Jul 2024 10:49:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757881.1167057; Fri, 12 Jul 2024 10:49:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sSDpn-0006qI-7I; Fri, 12 Jul 2024 10:49:03 +0000 Received: by outflank-mailman (input) for mailman id 757881; Fri, 12 Jul 2024 10:49:02 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sSDpm-00069W-25 for xen-devel@lists.xenproject.org; Fri, 12 Jul 2024 10:49:02 +0000 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [2a00:1450:4864:20::631]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5895b46f-403c-11ef-8776-851b0ebba9a2; Fri, 12 Jul 2024 12:49:00 +0200 (CEST) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a77c080b521so235972566b.3 for ; Fri, 12 Jul 2024 03:49:00 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a871ea8sm334048666b.193.2024.07.12.03.48.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 03:48:58 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5895b46f-403c-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720781339; x=1721386139; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p7axh6EnJqklc7K7yGfILdIpHtDv1zFetY1sm/s+FSk=; b=v+qlJPUTJ+vNkuDGcnkBPMD6JISn3zfUSJ1FKjDtFL2rFlB8H2Trp9fLAdrH6syIfC 3tFp9ZM7b0OUvvd0+0U4AOoZw9HceQIloRZplMJcxWv0cFGo5Op2/LYkIucHKBVDOyQA RGuGYWDWNEbhvahaWB/eZgvjwWBe/HGbEY0Yc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720781339; x=1721386139; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p7axh6EnJqklc7K7yGfILdIpHtDv1zFetY1sm/s+FSk=; b=rsCDnceKHe07v0Ejjoa/TuY2vnekLbDaIG7ra5DaEh5TKIQ1mNPE6JRY+P+MZLNMdj 3qqXBoG6i6Wf8KUWjquGGD1rGQgSYCOQdpsEmpNZhcnPVj8GDvlQQwTOfA5g1PsrGjcJ URwk56zJEMYS+IYpRzjFc/zILS46/dzRtMFfdKLxxgQnhEqFUTG0Roo/nAv4RbDaPJvk ltB8ermXlbWBi3aNIPYkUkgZtfGm+Jy2aqKj/FgGM++aMgl+Ja3MS2aNEnOV6z+xpE/B +oBWR0ODhUTKnB4ttNCqQUHj424KEaay6vrwK3/9miL2Cdicc00+P5K0qqeHC6adKel2 jzoA== X-Gm-Message-State: AOJu0Yyd+JKuL7SWJ5lfpb/88BGK6Kf3XchBb0Y2sCRQ6F0g2Lbo/M8b Wgd6isRbaXsFfDcZQp+9FIglZYcuyYxHtV9uiwycGHuyqruZizhWo/NIwtzuxNPZr7OgZDsDkZK M X-Google-Smtp-Source: AGHT+IEH9mI7bPeqY9CpchVq/W93icxxkJeR6Th2gPdAA3bxihFGluLeVetUxVaoPxCPEBsDpE8kNg== X-Received: by 2002:a17:906:2bcf:b0:a6f:6803:57ef with SMTP id a640c23a62f3a-a780b6b1b8amr705674366b.27.1720781339321; Fri, 12 Jul 2024 03:48:59 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 17/12] CI: Refresh Ubuntu Focal container as 20.04-x86_64 Date: Fri, 12 Jul 2024 11:48:55 +0100 Message-Id: <20240712104855.3237883-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Exactly as per 18.04 (Bionic). This saves ~500M: registry.gitlab.com/xen-project/xen/ubuntu 20.04-x86_64 1.06GB registry.gitlab.com/xen-project/xen/ubuntu focal 1.57GB Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio Runs with the new container: 4.16: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/7323548811 4.19: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/7323517116 --- .../build/ubuntu/20.04-x86_64.dockerfile | 72 +++++++++++++++++++ automation/build/ubuntu/focal.dockerfile | 49 ------------- automation/gitlab-ci/build.yaml | 16 ++--- automation/scripts/containerize | 2 +- 4 files changed, 81 insertions(+), 58 deletions(-) create mode 100644 automation/build/ubuntu/20.04-x86_64.dockerfile delete mode 100644 automation/build/ubuntu/focal.dockerfile diff --git a/automation/build/ubuntu/20.04-x86_64.dockerfile b/automation/build/ubuntu/20.04-x86_64.dockerfile new file mode 100644 index 000000000000..39fb297519ee --- /dev/null +++ b/automation/build/ubuntu/20.04-x86_64.dockerfile @@ -0,0 +1,72 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 ubuntu:20.04 +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive + +RUN < X-Patchwork-Id: 13731605 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 DC38EC2BD09 for ; Fri, 12 Jul 2024 10:49:20 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757883.1167067 (Exim 4.92) (envelope-from ) id 1sSDpy-0007NQ-J3; Fri, 12 Jul 2024 10:49:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757883.1167067; Fri, 12 Jul 2024 10:49:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sSDpy-0007NH-G7; Fri, 12 Jul 2024 10:49:14 +0000 Received: by outflank-mailman (input) for mailman id 757883; Fri, 12 Jul 2024 10:49:12 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sSDpw-0007Cp-Fc for xen-devel@lists.xenproject.org; Fri, 12 Jul 2024 10:49:12 +0000 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [2a00:1450:4864:20::534]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5f6a0121-403c-11ef-bbfb-fd08da9f4363; Fri, 12 Jul 2024 12:49:11 +0200 (CEST) Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5957040e32aso1175131a12.2 for ; Fri, 12 Jul 2024 03:49:11 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-594bc4e8255sm4410296a12.48.2024.07.12.03.49.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 03:49:10 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5f6a0121-403c-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720781351; x=1721386151; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RUJT2BIdasxYaH8JNljHtksephXciRwgCfX1hQqsIME=; b=DndSfh7EThB2TIJPRP1vJwjWbN47zsnhOGpF3OuMsrt5kMe57zyi6ASVo8PMX7IFH7 JDYS9YJqCQNwKE3cmKqpNejGE7AwfluLz/UFeeHmbOI/Lu3eAjbZyre/++fQXYuVQ8ve OW+AwRnsDp60MzGJp/NQclYRxlCjs4cXq8LCw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720781351; x=1721386151; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RUJT2BIdasxYaH8JNljHtksephXciRwgCfX1hQqsIME=; b=IWY2el9oqNTs3Ck3UEOvoWrXCjDXJYko1X/3ek0JH2V1nCoiZm3PgLZU0F7FrQ2kBF dpd1PJwZGDrtBC+cpT7VhYaGkxfQgHSNAo2HnorWPI9MuARTwu/HYQe0IvohThbUyBl2 Up/LGTU/J0eeJwnPHCri7W9D7M4buqbIcvY1vGAi+gUwzwwamCGCVg6wJORGHc0uZJfu PkIp23sjH1h0tFmrxIDy+LfyfCazzHhCOhOCXZuPd41LBTsN2vy+qiTDwPbDe4UkM9tf LERQPEnsW/o+OmGJXTgu8Ps8Rfu3yuquT8fsVT8XKMfSk/uS+a8dTAp6u2ZGrdmxDlum A+Wg== X-Gm-Message-State: AOJu0YyKscxuiEZsJUxAmwexlFPq/AAJtvKlWOZv21Tbn9+YPcH7/Q+Q Ls7hlNAxnI/V12Y7bF7twM5fHVJWi03OYzVNq95W7uBXVoGcOuQFeQmdxPXnKnDe4JFbMIvE2RQ p X-Google-Smtp-Source: AGHT+IH0NzEy0QCq3yDjqDKTMnR6Dpc6m6QnBWJwcFrqDQtiImhLCTRfhnkGKZihr5Uw3FeOhB29CA== X-Received: by 2002:aa7:ce1a:0:b0:57c:5f77:1136 with SMTP id 4fb4d7f45d1cf-594bb7745f7mr8979626a12.24.1720781350720; Fri, 12 Jul 2024 03:49:10 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 18/12] CI: Add Ubuntu 22.04 (Jammy) and 24.04 (Noble) testing Date: Fri, 12 Jul 2024 11:49:07 +0100 Message-Id: <20240712104907.3238026-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 The containers are exactly as per 20.04 (Focal). However, this now brings us to 5 releases * 4 build jobs worth of Ubuntu testing, which is overkill. The oldest and newest toolchains are the most likely to find problems with new code, so reduce the middle 3 releases (18/20/22) to just a single smoke test each. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio Pipeline run showing all Ubuntu testing on staging: https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/1371106799 There are 11 jobs in total. --- .../build/ubuntu/22.04-x86_64.dockerfile | 72 +++++++++++++++++++ .../build/ubuntu/24.04-x86_64.dockerfile | 72 +++++++++++++++++++ automation/gitlab-ci/build.yaml | 39 +++++----- automation/scripts/containerize | 2 + 4 files changed, 163 insertions(+), 22 deletions(-) create mode 100644 automation/build/ubuntu/22.04-x86_64.dockerfile create mode 100644 automation/build/ubuntu/24.04-x86_64.dockerfile base-commit: d46e4264c3fa68974fbb9b1bce514ea44af6d945 prerequisite-patch-id: b6875ad0bbd279067fdef31b9adf67e2a5abdf8a prerequisite-patch-id: 5d4a01a02e7694939cdbf620a2e7509fee49dd92 prerequisite-patch-id: 65ecea93b1a320219deb8670264c3d464e00384e prerequisite-patch-id: eb7042acce82d2bc324f8560fed3ffd57025d248 prerequisite-patch-id: 91c6663df2cfa139497e2d8b4dc17f1697f0c9f6 prerequisite-patch-id: 84c3345d580461986a3a9560735279baff21234f prerequisite-patch-id: 5d732fc5f039fb25f7177279f63019f59acae4b1 prerequisite-patch-id: dd5006da276abc0e4da1ecb2c84d699c5bd98124 prerequisite-patch-id: 7e816655cd1066b42be5fa57a832c777c9867fc9 prerequisite-patch-id: fc25cefbee4cb69703df5c1f5b3eb317f03952af prerequisite-patch-id: 531b3db898f54c05bff5fbcb69e0f7f62811c744 prerequisite-patch-id: ddb51b78aeaa2a6efe8035c39a128810c01aa822 prerequisite-patch-id: b4894b8120682429e1a74369c6b36bbbdc09d749 prerequisite-patch-id: c002530cb86a08b38980779a3d06cf491fdb9fae diff --git a/automation/build/ubuntu/22.04-x86_64.dockerfile b/automation/build/ubuntu/22.04-x86_64.dockerfile new file mode 100644 index 000000000000..230903f624d9 --- /dev/null +++ b/automation/build/ubuntu/22.04-x86_64.dockerfile @@ -0,0 +1,72 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 ubuntu:22.04 +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive + +RUN < X-Patchwork-Id: 13732463 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 43B58C3DA42 for ; Sat, 13 Jul 2024 18:10:14 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.758518.1167974 (Exim 4.92) (envelope-from ) id 1sShBp-0005yU-P8; Sat, 13 Jul 2024 18:09:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 758518.1167974; Sat, 13 Jul 2024 18:09:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sShBp-0005yN-LH; Sat, 13 Jul 2024 18:09:45 +0000 Received: by outflank-mailman (input) for mailman id 758518; Sat, 13 Jul 2024 18:09:45 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sShBp-0005yH-3d for xen-devel@lists.xenproject.org; Sat, 13 Jul 2024 18:09:45 +0000 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [2a00:1450:4864:20::633]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 14939cdf-4143-11ef-bbfb-fd08da9f4363; Sat, 13 Jul 2024 20:09:43 +0200 (CEST) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a77c1658c68so359320066b.0 for ; Sat, 13 Jul 2024 11:09:43 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a79bc820f2bsm68742666b.206.2024.07.13.11.09.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 11:09:42 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 14939cdf-4143-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720894183; x=1721498983; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4kLnfIhXGFRpZ63ksRdUUROBBVsX5+G8A7HW79LTA0Y=; b=C91IJTujgIoZtEaSzb5vBGVPhArPqlbesXaOsOy4VdYEszrocYUYtyEirjBMJB51QP p4q+dIGAC2cfcL9nxNDI2D+Ioi6dc0fGKKBxW44FJwIfg73jBPtn2NY7dwLjyJCmMwt6 +Z62Y01FS7+uYPHxBvI1snAE+AyyMmZqAt/k4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720894183; x=1721498983; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4kLnfIhXGFRpZ63ksRdUUROBBVsX5+G8A7HW79LTA0Y=; b=cL42PS8kBtMUHZEmz4g7/YnSTeKoxavIynwr46ideJe4xtAQvbyrQS9pbBs4ddbS8Z x3Fy8gOr1kt5JPh5EY87th2cxZKmTElRYdc1IGudVCXLvaxRflyh1i9bTsygf/1SItVg Lnzmf49F2jy4SndUvOSD9MkyjLKG41RU+Q3rvfXB0HXdFECU2uPyqKcXK78ZXANuuecb hM/ZYiHEVnOCjVPwXAX0lqFC+7RmDK2Fcu6GkLyHCvtMCnb/xhRVv4WCfrqPojCWN8jR 0jsKXYMdjgL8xTpZgYwPFuS44zMsU3NRiuwrYKNHQDwYqv7ZZGlHdBK/weg2XXxFBpzH CUvw== X-Gm-Message-State: AOJu0YwHc3j7C2zXpTMw9r0IvvDZ65e33ToCntoqBkMrpGiHOrw4nCDe PBZp2gu+HElCY2Vj+bKrCmCbQeQykiNY5kJo++0l4g7Y9a0fc5Iq3klvhMZ2MTwAqRazR3MNS9D e X-Google-Smtp-Source: AGHT+IF21P/TdDBvZv0ynJwpuwE7O+ftef5rHt2+0E4kNRYSDJa6QoX06m46PvsERr+7bCZ5r8Mq7w== X-Received: by 2002:a17:906:195a:b0:a77:e48d:bc9 with SMTP id a640c23a62f3a-a780b68a472mr833888266b.16.1720894182670; Sat, 13 Jul 2024 11:09:42 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko Subject: [PATCH 19/12] docs: Fix install-man$(1)-pages if no manpages are generated Date: Sat, 13 Jul 2024 19:09:39 +0100 Message-Id: <20240713180939.3363273-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 All tools to build manpages are optional, and if none of them happen to be present, the intermediate working directory may not even be created. Treat this as non-fatal, bringing the behaviour in line with install-html. Like the html side, it needs to be not-or to avoid Make thinking the rule has failed. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko --- docs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Makefile b/docs/Makefile index 966a104490ac..b30cc619f8dd 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -151,7 +151,7 @@ man$(1)-pages: $$(DOC_MAN$(1)) .PHONY: install-man$(1)-pages install-man$(1)-pages: man$(1)-pages $(INSTALL_DIR) $(DESTDIR)$(mandir) - cp -r man$(1) $(DESTDIR)$(mandir) + [ ! -d man$(1) ] || cp -r man$(1) $(DESTDIR)$(mandir) # Clean .PHONY: clean-man$(1)-pages From patchwork Sat Jul 13 18:09:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13732462 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 050D0C3DA45 for ; Sat, 13 Jul 2024 18:10:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.758519.1167984 (Exim 4.92) (envelope-from ) id 1sShC2-0006FF-V1; Sat, 13 Jul 2024 18:09:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 758519.1167984; Sat, 13 Jul 2024 18:09:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sShC2-0006F8-SB; Sat, 13 Jul 2024 18:09:58 +0000 Received: by outflank-mailman (input) for mailman id 758519; Sat, 13 Jul 2024 18:09:58 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sShC2-0005yH-7N for xen-devel@lists.xenproject.org; Sat, 13 Jul 2024 18:09:58 +0000 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [2a00:1450:4864:20::632]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 1cd5e8d0-4143-11ef-bbfb-fd08da9f4363; Sat, 13 Jul 2024 20:09:57 +0200 (CEST) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a77e392f59fso386958166b.1 for ; Sat, 13 Jul 2024 11:09:57 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a79bc5b4f17sm69088466b.59.2024.07.13.11.09.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 11:09:56 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1cd5e8d0-4143-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720894196; x=1721498996; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oIJ+HXKZFJyT9FRMoqI9Ea2vVNwCVYlPy9sOWH6JF6g=; b=EmZw4iNp6puyuMV+3Ph2qp1xzNHiPD+khxp8NTw4AFNTi8YLuQGs7rIx7zTa7aeNrY nUoLQWtrrPYL/LTRGKF5EVohSnH9hxptIkBX+KLadIJz4ET5YrsZwT1BxaAzrPEeWBC9 xBG9N90G2C1kVSp9Ln60uPoddRnFjQmBIo+ho= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720894196; x=1721498996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oIJ+HXKZFJyT9FRMoqI9Ea2vVNwCVYlPy9sOWH6JF6g=; b=EVzgeFhpQngdFkUNix2ivUYJf4JzYcZeHlnrccb8u2JzyKU+x8c51LGGOS2MOEsVpB 0a93zTCSqryphq+UxOImEZBujlO/MoFgfxZGzYzS8TvvjuktabRGWC+1c0J98y01fQjf U5MAcCwWtsJRs0vBZxEB+wWwBHt7uf1k67UTbhx0m7cCkY6oBHFjgQtqKAF8DuoPNbLm KgUBoYK1LYs5JnXdRRdDgQF/UpFlFmoPxWtQcIbaB21c2oddAmVKKmb9tLwRpmJ4gDHM RHh4tgzfygGpsPX7Ejy9RMqQ8yOyQRkMCwgIyLYgvhY4ANdPvawX+HslUElJXB94+eG3 H6mw== X-Gm-Message-State: AOJu0YzRIP7Ct9N7fTtq9IixVsJCffbs8yfRZB2Zmv5OZ2m3cutnixxn hRX0Lgx3C8Jr42CWnU5OjGMjsxty1Zzk9/rsYrHEzeJKk+OmGBJWowa+K8NxohFAXf2SyQfQ208 2 X-Google-Smtp-Source: AGHT+IHFTY3xVjAe7gXGEPjWu8gB7bkEO+P5UTfsNa1M9URLu4xMUJVrqxNdIh7xAe4pBD7nhB6Hzw== X-Received: by 2002:a17:907:724a:b0:a77:f2c5:84b7 with SMTP id a640c23a62f3a-a780b68a2c1mr1133965866b.5.1720894196653; Sat, 13 Jul 2024 11:09:56 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko Subject: [PATCH 20/12] CI: Swap from perl to perl-base in build containers Date: Sat, 13 Jul 2024 19:09:52 +0100 Message-Id: <20240713180952.3363596-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 We only need a basic perl environment, not the things that a primarily-perl project would want. Discovered during the Fedora refresh where the difference is ~40M, but it's more modest for OpenSUSE and Ubuntu. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/1372507213 --- automation/build/opensuse/leap-15.6-x86_64.dockerfile | 2 +- automation/build/opensuse/tumbleweed-x86_64.dockerfile | 2 +- automation/build/ubuntu/16.04-x86_64.dockerfile | 2 +- automation/build/ubuntu/18.04-x86_64.dockerfile | 2 +- automation/build/ubuntu/20.04-x86_64.dockerfile | 2 +- automation/build/ubuntu/22.04-x86_64.dockerfile | 2 +- automation/build/ubuntu/24.04-x86_64.dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/automation/build/opensuse/leap-15.6-x86_64.dockerfile b/automation/build/opensuse/leap-15.6-x86_64.dockerfile index ea70dffe2afc..d9ee34ff240f 100644 --- a/automation/build/opensuse/leap-15.6-x86_64.dockerfile +++ b/automation/build/opensuse/leap-15.6-x86_64.dockerfile @@ -31,7 +31,7 @@ RUN < X-Patchwork-Id: 13732464 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 B6D72C3DA45 for ; Sat, 13 Jul 2024 18:10:20 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.758521.1167994 (Exim 4.92) (envelope-from ) id 1sShCI-0007bP-64; Sat, 13 Jul 2024 18:10:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 758521.1167994; Sat, 13 Jul 2024 18:10:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sShCI-0007bG-3W; Sat, 13 Jul 2024 18:10:14 +0000 Received: by outflank-mailman (input) for mailman id 758521; Sat, 13 Jul 2024 18:10:13 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sShCH-0007ZN-0f for xen-devel@lists.xenproject.org; Sat, 13 Jul 2024 18:10:13 +0000 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [2a00:1450:4864:20::530]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 24d45d7e-4143-11ef-8776-851b0ebba9a2; Sat, 13 Jul 2024 20:10:10 +0200 (CEST) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-58b966b4166so3531798a12.1 for ; Sat, 13 Jul 2024 11:10:10 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-59b268a276bsm1032999a12.62.2024.07.13.11.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jul 2024 11:10:09 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 24d45d7e-4143-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720894209; x=1721499009; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s6fAtMIT94yky8pHVJDXIYIarNbDIr23fg32SpVsiVQ=; b=pjW4oomp240l+7xIT7bnhVouXAHDc8+XDoVV5M6rRO+yYalpZ51+nlunaYfgG+medy A4KBFSyJuhQSAj5vg1tVPwY5zKIvMNgy38K278BTgC2jeVhUNj1w+x+0DZG3hbQs157a jAwFCWkJSRGCTaktRNAugG+139FVUThRc6S+Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720894209; x=1721499009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s6fAtMIT94yky8pHVJDXIYIarNbDIr23fg32SpVsiVQ=; b=dvpyAjyf/XE3GZs4jSIE33x9h8QJ38Uw1IXL7qoDgvEBPPWLkObxRrzSucbV0Wo1sP FBxEurMTAjDn3yJ8mR1EjvVHfdazDMeJEXhoVitEw8C3H78aho//snDQyOkQ9P3c7QsG pDUYq6AB6QqJr4VQKPA08NfrX3QCN/PR58WCfUqPbDKItmqd7t1uFl6oppVgl3P/OlR2 L/fCyDp2bLmHJhvRlBGuDdqo1phqXIB8fjurEq8ieo3fXplWaow45t2Yw2ZZOM8QMfHj niUYF0Rdx1fZApfekWP0eoRxpsiUbxiPD5U/idZeqmUsUnlfxS6JDxnuRZoIW3R+PxqD 1ZaQ== X-Gm-Message-State: AOJu0YwISa6GDxEu3RWbLsQsR79teWyVqfToWrbYobFo1xU90e8VplPM CPCzoWQKIKzDQrq9F/ujzcuQf22WZj6fSIwDVFYenXx5QTSSBxRR5NlU7TeikhItW64z2zKb8mO 0 X-Google-Smtp-Source: AGHT+IGgXWdmRLGxrgbJMVxd6DutUs1bIDmd+1li+pW6atF+0sWhL7/H9Dw7FkksNRzzjdVAb4AeCQ== X-Received: by 2002:a50:ee85:0:b0:57d:619:7721 with SMTP id 4fb4d7f45d1cf-594bb5807c7mr8840331a12.21.1720894209550; Sat, 13 Jul 2024 11:10:09 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko Subject: [PATCH 21/12] CI: Refresh and upgrade the Fedora container Date: Sat, 13 Jul 2024 19:10:05 +0100 Message-Id: <20240713181005.3363912-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Fedora 29 is long out of date. Move forward 5 years to Fedora 39. Inlcude all the usual improvements. Rework the container to be non-root, use heredocs for legibility, and switch to the new naming scheme. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko I know Fedora 40 the latest release, but it suffers from the same stubdom failure as Archlinux currently does. Fedora 39 builds fine. Fedora is (correctly) blocking, so adding 40 would be bad move at this point in the 4.19 release. https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/1372042761 is a run with both 39 and 40, showing the failure. --- automation/build/fedora/29.dockerfile | 46 ------------ automation/build/fedora/39-x86_64.dockerfile | 74 ++++++++++++++++++++ automation/gitlab-ci/build.yaml | 8 +-- 3 files changed, 78 insertions(+), 50 deletions(-) delete mode 100644 automation/build/fedora/29.dockerfile create mode 100644 automation/build/fedora/39-x86_64.dockerfile diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedora/29.dockerfile deleted file mode 100644 index d5f017ac723d..000000000000 --- a/automation/build/fedora/29.dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 fedora:29 -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -# install Xen depends -RUN dnf -y install \ - clang \ - gcc \ - gcc-c++ \ - ncurses-devel \ - zlib-devel \ - python-devel \ - python3-devel \ - libuuid-devel \ - pkgconfig \ - flex \ - bison \ - libaio-devel \ - glib2-devel \ - yajl-devel \ - pixman-devel \ - glibc-devel \ - make \ - binutils \ - git \ - wget \ - acpica-tools \ - python-markdown \ - patch \ - checkpolicy \ - dev86 \ - xz-devel \ - bzip2 \ - nasm \ - ocaml \ - ocaml-findlib \ - golang \ - # QEMU - ninja-build \ - && dnf clean all && \ - rm -rf /var/cache/dnf - -RUN useradd --create-home user -USER user -WORKDIR /build diff --git a/automation/build/fedora/39-x86_64.dockerfile b/automation/build/fedora/39-x86_64.dockerfile new file mode 100644 index 000000000000..e2048a437581 --- /dev/null +++ b/automation/build/fedora/39-x86_64.dockerfile @@ -0,0 +1,74 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 fedora:39 +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +RUN < X-Patchwork-Id: 13733595 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 B3542C3DA4A for ; Mon, 15 Jul 2024 15:17:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.759015.1168548 (Exim 4.92) (envelope-from ) id 1sTNRX-0006UD-1Z; Mon, 15 Jul 2024 15:16:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 759015.1168548; Mon, 15 Jul 2024 15:16:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sTNRW-0006U6-UZ; Mon, 15 Jul 2024 15:16:46 +0000 Received: by outflank-mailman (input) for mailman id 759015; Mon, 15 Jul 2024 15:16:45 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sTNRV-0006U0-OW for xen-devel@lists.xenproject.org; Mon, 15 Jul 2024 15:16:45 +0000 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [2a00:1450:4864:20::636]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3ec658d9-42bd-11ef-bbfb-fd08da9f4363; Mon, 15 Jul 2024 17:16:44 +0200 (CEST) Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a77c080b521so482250166b.3 for ; Mon, 15 Jul 2024 08:16:44 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a79bc7ff893sm220987166b.147.2024.07.15.08.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:16:42 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 3ec658d9-42bd-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1721056603; x=1721661403; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yVJPldX7VXCeLiRYSK0tTv3jEja/PrajLyWOuBIo7/U=; b=lTRRjvEVAV6LRR6iAK6bOSSUBqD/mm42/n4dcyy5w1oW1uc23Dqhj9NOTUEl3dH+mN Vvhcm7G0eEZi6/9qQcgp0NhmSC3E7O5lBbsZjHp2VEiui5TE795gVB9PmpeGXyv5AsVh s7XOMqDwMpdI36gLi9bUkbnMI3+0eJGVnJocA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721056603; x=1721661403; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yVJPldX7VXCeLiRYSK0tTv3jEja/PrajLyWOuBIo7/U=; b=W4la0jE8JdbbifyPXPJSN83Sj6vpdjERejJolSnjCFnR5HkPuJdsiFfP+gkkemP5m3 pfeD8Cwafd2zcRLDiZ1vnAIiMJcnVtZ+sUaj+jmCX+pmkfO2vtXtUgaTvU+5jw65BESe EUnrKsNMXmyhFK9eIff5a5kd6hUfwt1NBq9dbaJQ3AB4xZAvuZvgotMteiGugV42Pfgb F0ge6nFuz9+s3RBQ0lyRqkenwr4qO7Db+29Pt00V3N1AUWotNIq+FusGWwVb4TKmgBFn MD4QXWpNmOhiX0JNMsOcWCXNBeeZTf4nZx5X7M7ce/OcbIpo3vK7TTDHxV+6wnsDcTUf 7prQ== X-Gm-Message-State: AOJu0YyEqaZ6WU+1OQl+qOT6y7orGHD8G8PmwOZ6it2m2pYdQgeLuqS8 DtQWoXbredDT7qV0hKRmSsKZVVvrsaBdHXXkjN0Q1INetvwY+TfjvWFGCuKIFc4WdrR7rwChVrW h X-Google-Smtp-Source: AGHT+IGJE15djMpAePK2JIhLEDuf5nCCmMtPHad2moFXfqRXOC3yEnPgtKZMcfKsAneved+tP28SnQ== X-Received: by 2002:a17:906:1786:b0:a6f:51d8:1963 with SMTP id a640c23a62f3a-a79e6a5c54emr5558166b.43.1721056603111; Mon, 15 Jul 2024 08:16:43 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko Subject: [PATCH 22/12] tools/examples: Remove more obsolete content Date: Mon, 15 Jul 2024 16:16:40 +0100 Message-Id: <20240715151640.3374005-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 xeninfo.pl was introduced in commit 1b0a8bb57e3e ("Added xeninfo.pl, a script for collecting statistics from Xen hosts using the Xen-API") and has been touched exactly twice since to remove hardcoded IP addresses and paths. The configuration files in vnc/* date from when we had a vendered version of Qemu living in the tree. These have never (AFAICT) been wired into the `make install` rule. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko --- tools/examples/vnc/Xservers | 5 - tools/examples/vnc/Xvnc-xen | 53 ------- tools/examples/xeninfo.pl | 284 ------------------------------------ 3 files changed, 342 deletions(-) delete mode 100644 tools/examples/vnc/Xservers delete mode 100755 tools/examples/vnc/Xvnc-xen delete mode 100644 tools/examples/xeninfo.pl diff --git a/tools/examples/vnc/Xservers b/tools/examples/vnc/Xservers deleted file mode 100644 index adc5748be6ba..000000000000 --- a/tools/examples/vnc/Xservers +++ /dev/null @@ -1,5 +0,0 @@ -# Configuration lines to go in /etc/X11/xdm/Xservers to -# start Xvnc and connect back to a vncviewer in domain-0. -# See 'man xdm' under 'LOCAL SERVER SPECIFICATION' for format details. - -:1 Xvnc local /usr/X11R6/bin/Xvnc-xen :1 \ No newline at end of file diff --git a/tools/examples/vnc/Xvnc-xen b/tools/examples/vnc/Xvnc-xen deleted file mode 100755 index 15058e622d7f..000000000000 --- a/tools/examples/vnc/Xvnc-xen +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -#============================================================================ -# This script should be installed in /usr/X11R6/bin/Xvnc-xen. -#============================================================================ -# -# Start Xvnc and use vncconnect to connect back to a vncviewer listening in -# domain 0. The host and port to connect to are given by -# -# VNC_VIEWER=: -# -# in the kernel command line (/proc/cmdline). -# -# The '--vnc' option to 'xm create' will start a vncviewer and -# pass its address in VNC_VIEWER for this script to find. -# -# Usage: -# Xvnc-xen [args] -# -# Any arguments are passed to Xvnc. -# -#============================================================================ - -# Prefix for messages. -M="[$(basename $0)]" - -# Usage: vnc_addr -# Print : for the vncviewer given in -# the kernel command line. -vnc_addr () { - sed -n -e "s/.*VNC_VIEWER=\([^ ]*\).*/\1/p" /proc/cmdline -} - -# Usage: vnc_connect -# If a vncviewer address was given on the kernel command line, -# run vncconnect for it. -vnc_connect () { - local addr=$(vnc_addr) - - if [ -n "${addr}" ] ; then - echo "$M Connecting to ${addr}." - vncconnect ${addr} - else - echo "$M No VNC_VIEWER in kernel command line." - echo "$M Create the domain with 'xm create --vnc '." - return 1 - fi -} - -# Start the vnc server. -Xvnc "$@" >/dev/null 2>&1 & - -# Connect back to the viewer in domain-0. -vnc_connect diff --git a/tools/examples/xeninfo.pl b/tools/examples/xeninfo.pl deleted file mode 100644 index 95a15d9595c0..000000000000 --- a/tools/examples/xeninfo.pl +++ /dev/null @@ -1,284 +0,0 @@ -#!/usr/bin/perl -w - -############################################################################################################# -# # -# Developed by Ingard Mevåg @ Oslo University College, spring 2007 # -# ingard [at] mevaag [dot] no # -# # -# This work is licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 License. # -# To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/ or send a letter # -# to Creative Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA. # -# # -############################################################################################################# - -use strict; -# http://search.cpan.org/~rjray/RPC-XML-0.59/lib/RPC/XML/Client.pm -require RPC::XML; -require RPC::XML::Client; - -# for debug purposes -#use Data::Dumper; - -##### CONFIG ###### - -my %xenhosts = ("192.0.2.10" => {"port" => "9363"}, - "192.0.2.11" => {"port" => "9363"}, - "192.0.2.12" => {"port" => "9363"}, - "192.0.2.13" => {"port" => "9363"}); - -##### CONFIG END ### - -##### STATIC VARS ##### -my %host_info; - -####################### -sub apiconnect -{ - foreach my $xenhost (keys %xenhosts) - { - my $xen = RPC::XML::Client->new("http://$xenhost:$xenhosts{$xenhost}{'port'}"); - my $session = $xen->simple_request("session.login_with_password", "user",""); - if (! $session) - { - print "Can't connect to $xenhost :(\n"; - $xenhosts{$xenhost} = {'xen' => $xen, 'session' => ""}; - } - else - { - $xenhosts{$xenhost} = {'xen' => $xen, 'session' => $session->{'Value'}}; - print "Connected successfully to $xenhost..\n"; - } - } -} - -sub validate_response -{ - my ($result_ref) = @_; - if ($result_ref->{'Status'} eq "Success") - { - return $result_ref->{'Value'}; - } - else - { - # status = Failure ! -# die ("xmlrpc failed! ErrorDescription: $result_ref->{'ErrorDescription'}[1] -> $result_ref->{'ErrorDescription'}[0]"); - print "xmlrpc failed! ErrorDescription: $result_ref->{'ErrorDescription'}[1] -> $result_ref->{'ErrorDescription'}[0]\n"; - } -} - -sub get_host_cpu_utilisation -{ - my ($xen, $session, $host_name, $host_ref) = @_; - my $host_cpu_ref = validate_response($xen->simple_request("host.get_host_CPUs", $session, $host_ref)); - foreach (@$host_cpu_ref) - { - my $host_cpu_utilisation = validate_response($xen->simple_request("host_cpu.get_utilisation", $session, $_)); - $host_info{$host_name}{'cpus'}{$_} = $host_cpu_utilisation; - print " CPUiNFO: $host_cpu_utilisation\n"; - } -} - -sub get_host_pif_utilisation -{ - my ($xen, $session, $host_name, $host_ref) = @_; - -# This method isnt implemented yet it seems so using PIF.get_all for now.. -# This will break when xen is made cluster aware.. -# my $host_pif_ref = validate_response($xen->simple_request("host.get_PIFs", $session, $host_ref)); - my $host_pif_ref = validate_response($xen->simple_request("PIF.get_all", $session)); - foreach (@$host_pif_ref) - { - my $host_pif_device = validate_response($xen->simple_request("PIF.get_device", $session, $_)); - my $host_pif_metrics_ref = validate_response($xen->simple_request("PIF.get_metrics", $session, $_)); - -# Whats the best solution performancewise? -# Collecting stats from get_records, or pulling individually? - -# my $host_pif_record = validate_response($xen->simple_request("PIF_metrics.get_record", $session, $host_pif_metrics_ref)); -# my $host_pif_io_read = $host_pif_record->{'io_read_kbs'}; -# my $host_pif_io_write = $host_pif_record->{'io_write_kbs'}; - my $host_pif_io_read = validate_response($xen->simple_request("PIF_metrics.get_io_read_kbs", $session, $host_pif_metrics_ref)); - my $host_pif_io_write = validate_response($xen->simple_request("PIF_metrics.get_io_write_kbs", $session, $host_pif_metrics_ref)); - - $host_info{$host_name}{'pifs'}{$host_pif_device} = {'read' => $host_pif_io_read, 'write' => $host_pif_io_write}; - print " PiFiNFO: $host_pif_device READ: $host_pif_io_read - WRITE: $host_pif_io_write\n"; -# $host_info{$host_name}{'pifs'}{$host_pif_device}{'read'} = $host_pif_io_read; -# $host_info{$host_name}{'pifs'}{$host_pif_device}{'write'} = $host_pif_io_write; - } -} - -sub get_host_mem_utilisation -{ - my ($xen, $session, $host_name, $host_ref) = @_; - my $host_metrics_ref = validate_response($xen->simple_request("host.get_metrics", $session, $host_ref)); - my $host_mem_total = validate_response($xen->simple_request("host_metrics.get_memory_total", $session, $host_metrics_ref)) / 1024 / 1024; - my $host_mem_free = validate_response($xen->simple_request("host_metrics.get_memory_free", $session, $host_metrics_ref)) / 1024 / 1024; - $host_info{$host_name}{'memory'} = {'total' => $host_mem_total, 'free' => $host_mem_free}; - print " MEMiNFO: Total: $host_mem_total MB - Free: $host_mem_free MB\n"; -} - -sub get_vm_mem_info -{ - my ($xen, $session, $host_name, $vm_ref, $vm_name_label) = @_; - my $vm_mem_stat_max = validate_response($xen->simple_request("VM.get_memory_static_max",$session,$vm_ref)); - my $vm_mem_stat_min = validate_response($xen->simple_request("VM.get_memory_static_min",$session,$vm_ref)); - my $vm_mem_dyn_max = validate_response($xen->simple_request("VM.get_memory_dynamic_max",$session,$vm_ref)); - my $vm_mem_dyn_min = validate_response($xen->simple_request("VM.get_memory_dynamic_min",$session,$vm_ref)); - - # not implemented yet.. We'll do this at the same time as getting cpu utilisation - # in the get_vm_metrics sub instead.. - #my $vm_metrics_ref = validate_response($xen->simple_request("VM.get_metrics",$session,$vm_ref)); - #my $vm_mem_actual = validate_response($xen->simple_request("VM_metrics.get_memory_actual",$session,$vm_metrics_ref)); - - $host_info{$host_name}{'vms'}{$vm_name_label}{'memory'} = {'static_max' => $vm_mem_stat_max, - 'static_min' => $vm_mem_stat_min, - 'dynamic_max' => $vm_mem_dyn_max, - 'dynamic_min' => $vm_mem_dyn_min}; - - # xm list uses the dynamic min var as far as i can tell.. or? - # Lets print the memactual info instead of this... I'll do that in the get_vm_metrics sub instead.. - # print " |- MEMiNFO: Dynamic Min: $vm_mem_dyn_min - Actually in use: $vm_mem_actual\n"; -} - -sub get_vm_metrics -{ - my ($xen, $session, $host_name, $vm_ref, $vm_name_label) = @_; - my $vm_metrics_ref = validate_response($xen->simple_request("VM.get_metrics",$session,$vm_ref)); - - my %vm_vcpu_utilisation = %{validate_response($xen->simple_request("VM_metrics.get_vcpus_utilisation",$session,$vm_metrics_ref))}; - for my $tempcpu (keys %vm_vcpu_utilisation) - { - print " |- CPUiNFO: $tempcpu - $vm_vcpu_utilisation{$tempcpu}\n"; - $host_info{$host_name}{'vms'}{$vm_name_label}{'vcpus'} = {$tempcpu => $vm_vcpu_utilisation{$tempcpu}}; - } - my $vm_mem_actual = validate_response($xen->simple_request("VM_metrics.get_memory_actual",$session,$vm_metrics_ref)) / 1024 / 1024; - $host_info{$host_name}{'vms'}{$vm_name_label}{'memory'}{'actual'} = "$vm_mem_actual"; - print " |- MEMiNFO: Actually in use: $vm_mem_actual MB\n"; -} - -sub get_vm_vif_utilisation -{ - my ($xen, $session, $host_name, $vm_ref, $vm_name_label) = @_; - my $vm_vifs = validate_response($xen->simple_request("VM.get_VIFs",$session,$vm_ref)); - foreach (@$vm_vifs) - { - my $vif_device = validate_response($xen->simple_request("VIF.get_device",$session,$_)); - my $vif_io_read = validate_response($xen->simple_request("VIF_metrics.get_io_read_kbs", $session, $_)); - my $vif_io_write = validate_response($xen->simple_request("VIF_metrics.get_io_write_kbs", $session, $_)); - $host_info{$host_name}{'vms'}{$vm_name_label}{'vifs'}{$vif_device} = {'read' => $vif_io_read, 'write' => $vif_io_write}; - print " |- ViFiNFO: $vif_device READ: $vif_io_read - WRITE: $vif_io_write\n"; - } -} - -sub get_vm_vbd_utilisation -{ - my ($xen, $session, $host_name, $vm_ref, $vm_name_label) = @_; - my $vm_vbds = validate_response($xen->simple_request("VM.get_VBDs",$session,$vm_ref)); - foreach (@$vm_vbds) - { - my $vbd_device = validate_response($xen->simple_request("VBD.get_device",$session,$_)); - my $vbd_io_read = validate_response($xen->simple_request("VBD_metrics.get_io_read_kbs", $session, $_)); - my $vbd_io_write = validate_response($xen->simple_request("VBD_metrics.get_io_write_kbs", $session, $_)); - $host_info{$host_name}{'vms'}{$vm_name_label}{'vbds'}{$vbd_device} = {'read' => $vbd_io_read, 'write' => $vbd_io_write}; - print " |- VBDiNFO: $vbd_device READ: $vbd_io_read - WRITE: $vbd_io_write\n"; - } -} - - -sub get_vm_type -{ - my ($xen, $session, $host_name, $vm_ref, $vm_name_label) = @_; - # not running response through validate_response() here to stop it from crashing.. - # - # api docs says if this (following) field is set, its a HVM domain. - my $vm_bootloader_results = $xen->simple_request("VM.get_HVM_boot_policy",$session,$vm_ref); - if ("$vm_bootloader_results->{'Status'}" eq "Success") - { - if ("$vm_bootloader_results->{'Value'}" ne "") - { - $host_info{$host_name}{'vms'}{$vm_name_label}{'type'} = "HVM"; - } - else - { - $host_info{$host_name}{'vms'}{$vm_name_label}{'type'} = "PV"; - } - } - else - { - # However, xen 3.0.4 doest support this part of the api, so afaik I can get the difference with: - my $vm_pv_kernel_results = $xen->simple_request("VM.get_PV_kernel",$session,$vm_ref); - # which is something like: - # 'PV_kernel': '/boot/vmlinuz-2.6.18-xen', - # or - # 'PV_kernel': 'hvmloader', - if ("$vm_pv_kernel_results->{'Value'}" =~ m/hvm/i) - { - $host_info{$host_name}{'vms'}{$vm_name_label}{'type'} = "HVM"; - } - else - { - $host_info{$host_name}{'vms'}{$vm_name_label}{'type'} = "PV"; - } - } -} - -sub get_complete_info -{ - my %all_vms; - foreach my $xenhost (sort keys %xenhosts) - { - next unless $xenhosts{$xenhost}{'session'}; - my $xen = $xenhosts{$xenhost}{'xen'}; - my $session = $xenhosts{$xenhost}{'session'}; - print "_______________________\n## $xenhost ##\n-----------------------\n"; - - my $host_ref = validate_response($xen->simple_request("session.get_this_host", $session)); - - my $host_name = validate_response($xen->simple_request("host.get_name_label", $session, $host_ref)); - $xenhosts{$xenhost}{'hostname'} = $host_name; - $host_info{$host_name}{'ip'} = $xenhost; - - get_host_cpu_utilisation($xen, $session, $host_name, $host_ref); - - get_host_mem_utilisation($xen, $session, $host_name, $host_ref); - - get_host_pif_utilisation($xen, $session, $host_name, $host_ref); - - - my $all_vm_refs = validate_response($xen->simple_request("host.get_resident_VMs",$session, $host_ref)); - - foreach my $vm_ref (@$all_vm_refs) - { - my $vm_name_label = validate_response($xen->simple_request("VM.get_name_label",$session,$vm_ref)); - get_vm_type($xen,$session,$host_name,$vm_ref,$vm_name_label); - - my $vm_id = validate_response($xen->simple_request("VM.get_domid",$session,$vm_ref)); - - print "vm: $vm_id\t$vm_name_label\ttype: $host_info{$host_name}{'vms'}->{$vm_name_label}{'type'}\n"; - - # vm_metrics includes both mem_actual & cpu utilisation - # So we'll add all stats found in that class in one go.. - get_vm_metrics($xen,$session,$host_name,$vm_ref,$vm_name_label); -# get_vm_cpu_utilisation($xen,$session,$host_name,$vm_ref,$vm_name_label); - - # all other mem stats are added seperately.. - # This might not be needed at all as xen doesnt have functionality to - # resize mem for a VM atm (afaik) - get_vm_mem_info($xen,$session,$host_name,$vm_ref,$vm_name_label); - - get_vm_vif_utilisation($xen,$session,$host_name,$vm_ref,$vm_name_label); - - get_vm_vbd_utilisation($xen,$session,$host_name,$vm_ref,$vm_name_label); - - $all_vms{$vm_name_label} = "" unless ("$vm_name_label" eq "Domain-0"); - } - print "\n"; - } - # Debug: Uncomment to see the nested datastructure.. - #print Dumper(%host_info); -} - - - -apiconnect(); -get_complete_info();