From nobody Tue May 14 20:44:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1691630307; cv=none; d=zohomail.com; s=zohoarc; b=IPAYZg89oAC23ZSdm788XLmvspOynft6QAo7pKMGCj8ZtWN0YpnTzRStkgwHmYG8b00c3WTNeGxITFnjXT9t1zpzVrhYbszcljFVgugjRYT+udCZ8jI5Ybld6zCAJDQ2NTKB+PrhXXYCPZt4icpV00vS27nbMjNsjo6pLXx3N3s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691630307; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PjUjLKcyl3XmvPWIqrHg6yIptCg5T8qnoIvvf2hEU6o=; b=CdKzHkB+UVFgYWCg8Ukss421kUfIYjpcAzawqKUz3/y/ON23wU//p5WragxOrZpGKrG5UewtSmaMWOzh4q1QlUNpaywLtpCmGiWHLcQxJBfCjO5DH7S8R9Gilu37C6kVcoFKf1YnXHAyDGaaCn8wzI4McvDHCT4vmSNE3HKduGY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1691630307484462.07542083215515; Wed, 9 Aug 2023 18:18:27 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.581774.911179 (Exim 4.92) (envelope-from ) id 1qTuJW-0005jT-G7; Thu, 10 Aug 2023 01:18:10 +0000 Received: by outflank-mailman (output) from mailman id 581774.911179; Thu, 10 Aug 2023 01:18:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qTuJW-0005jL-Cy; Thu, 10 Aug 2023 01:18:10 +0000 Received: by outflank-mailman (input) for mailman id 581774; Thu, 10 Aug 2023 01:18:09 +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 1qTuJV-0005Qg-5s for xen-devel@lists.xenproject.org; Thu, 10 Aug 2023 01:18:09 +0000 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c3239f55-371b-11ee-b283-6b7b168915f2; Thu, 10 Aug 2023 03:18:08 +0200 (CEST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id ECB9564D18; Thu, 10 Aug 2023 01:18:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9621AC433C8; Thu, 10 Aug 2023 01:18:05 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: c3239f55-371b-11ee-b283-6b7b168915f2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691630286; bh=o38hDMnErido2ocHdI4zOyxzy0EWOn0IUkAUdx/QJ5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NjFuEjfmX4xYuUz86XSf3p6NV88k94l5oPSF9igwU30zhAN4C9jdSkq9Mfujm+TWr +pYCLHQSCXjOmKR2YExfdXpQ2c9C2ubEqQDr1KBb5qDqnmkfsZzHwJYlzXuPGhN0FN kt4gHvm6d35+0qfWBT2Qo/ePS+eDus44lZmqVw3+tj7Q7JbjgPGoy8ZSAEExj3kjel cifE6ui9zLiDtdWVmiVnVf9EvVb1cvQ0NY1AepZGwrT0ySMhQyFIsNB65TRJiANtkL WYCjm4WMjernOfp4Hca54Exgwty/GvaO1giAddbx7XbnNMeKPQ7GGvGnBEkdl9/Gta vAChxAxJhDoKA== From: Stefano Stabellini To: michal.orzel@amd.com Cc: sstabellini@kernel.org, xen-devel@lists.xenproject.org, cardoe@cardoe.com, Stefano Stabellini Subject: [PATCH 1/2] automation: upgrade Alpine build and test artifact containers to 3.18 Date: Wed, 9 Aug 2023 18:18:02 -0700 Message-Id: <20230810011803.311832-1-sstabellini@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1691630308115100001 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini Alpine 3.12 is EOL. Also update the containerize script. Signed-off-by: Stefano Stabellini Reviewed-by: Michal Orzel --- .../{3.12-arm64v8.dockerfile =3D> 3.18-arm64v8.dockerfile} | 2 +- automation/build/alpine/{3.12.dockerfile =3D> 3.18.dockerfile} | 2 +- automation/scripts/containerize | 4 ++-- .../{3.12-arm64v8.dockerfile =3D> 3.18-arm64v8.dockerfile} | 4 ++-- .../alpine/{3.12.dockerfile =3D> 3.18.dockerfile} | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename automation/build/alpine/{3.12-arm64v8.dockerfile =3D> 3.18-arm64v8.= dockerfile} (96%) rename automation/build/alpine/{3.12.dockerfile =3D> 3.18.dockerfile} (97%) rename automation/tests-artifacts/alpine/{3.12-arm64v8.dockerfile =3D> 3.1= 8-arm64v8.dockerfile} (97%) rename automation/tests-artifacts/alpine/{3.12.dockerfile =3D> 3.18.docker= file} (97%) diff --git a/automation/build/alpine/3.12-arm64v8.dockerfile b/automation/b= uild/alpine/3.18-arm64v8.dockerfile similarity index 96% rename from automation/build/alpine/3.12-arm64v8.dockerfile rename to automation/build/alpine/3.18-arm64v8.dockerfile index 1be3bf7805..ce198f7d04 100644 --- a/automation/build/alpine/3.12-arm64v8.dockerfile +++ b/automation/build/alpine/3.18-arm64v8.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.12 +FROM arm64v8/alpine:3.18 LABEL maintainer.name=3D"The Xen Project" \ maintainer.email=3D"xen-devel@lists.xenproject.org" =20 diff --git a/automation/build/alpine/3.12.dockerfile b/automation/build/alp= ine/3.18.dockerfile similarity index 97% rename from automation/build/alpine/3.12.dockerfile rename to automation/build/alpine/3.18.dockerfile index 72ad3a07ad..ca5756955e 100644 --- a/automation/build/alpine/3.12.dockerfile +++ b/automation/build/alpine/3.18.dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.18 LABEL maintainer.name=3D"The Xen Project" \ maintainer.email=3D"xen-devel@lists.xenproject.org" =20 diff --git a/automation/scripts/containerize b/automation/scripts/container= ize index 6d46f63665..16d480ab75 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -24,8 +24,8 @@ die() { # BASE=3D"registry.gitlab.com/xen-project/xen" case "_${CONTAINER}" in - _alpine) CONTAINER=3D"${BASE}/alpine:3.12" ;; - _alpine-arm64v8) CONTAINER=3D"${BASE}/alpine:3.12-arm64v8" ;; + _alpine) CONTAINER=3D"${BASE}/alpine:3.18" ;; + _alpine-arm64v8) CONTAINER=3D"${BASE}/alpine:3.18-arm64v8" ;; _archlinux|_arch) CONTAINER=3D"${BASE}/archlinux:current" ;; _riscv64) CONTAINER=3D"${BASE}/archlinux:current-riscv64" ;; _centos7) CONTAINER=3D"${BASE}/centos:7" ;; diff --git a/automation/tests-artifacts/alpine/3.12-arm64v8.dockerfile b/au= tomation/tests-artifacts/alpine/3.18-arm64v8.dockerfile similarity index 97% rename from automation/tests-artifacts/alpine/3.12-arm64v8.dockerfile rename to automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile index cb8e9e59bb..cbd96d9bc6 100644 --- a/automation/tests-artifacts/alpine/3.12-arm64v8.dockerfile +++ b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.12 +FROM arm64v8/alpine:3.18 LABEL maintainer.name=3D"The Xen Project" \ maintainer.email=3D"xen-devel@lists.xenproject.org" =20 @@ -18,7 +18,7 @@ RUN \ apk add sudo && \ apk add dbus && \ apk add bash && \ - apk add python2 && \ + apk add python3 && \ apk add zlib && \ apk add ncurses && \ apk add texinfo && \ diff --git a/automation/tests-artifacts/alpine/3.12.dockerfile b/automation= /tests-artifacts/alpine/3.18.dockerfile similarity index 97% rename from automation/tests-artifacts/alpine/3.12.dockerfile rename to automation/tests-artifacts/alpine/3.18.dockerfile index 073f16a0d7..32aa8e1778 100644 --- a/automation/tests-artifacts/alpine/3.12.dockerfile +++ b/automation/tests-artifacts/alpine/3.18.dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.18 LABEL maintainer.name=3D"The Xen Project" \ maintainer.email=3D"xen-devel@lists.xenproject.org" =20 @@ -19,7 +19,7 @@ RUN \ apk add sudo && \ apk add dbus && \ apk add bash && \ - apk add python2 && \ + apk add python3 && \ apk add zlib && \ apk add ncurses && \ apk add texinfo && \ --=20 2.25.1 From nobody Tue May 14 20:44:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1691630310; cv=none; d=zohomail.com; s=zohoarc; b=dIS/kYkssBtTnyetT2InSe2u5H97S1G/e1cGOISocIKWsOLYXT2EZwMlVf23J2al7Awusw+WGSItpWsIuDvvmrWmwicdBKgAGqLLBKwQQf11fS38Q9X0/MjXCmReXQd1ZW1j/dvbTQ2RhBl32uWXZSD+CN6c7D0SCu4UpozC2kY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1691630310; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nImRdT+eBULXKBQKNRITgehGnR7a0b7WHihm8fJN7+I=; b=f96X0A6h5lKloSmEtvghkjILS84xRrWq/liAS/9I3G+h3WyI5zsDcYAQAIXwZP4kKICZSxMWk32RvJsCrPmGf9gvx9pNnXusqnXP58gVT9lGsIeLlR+htWZBpGHbBXqYq6NSYhLRIeo7XEAPkjN2rfe4F4MuAg6nSzxWKwQ46tM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1691630310506433.1655872107988; Wed, 9 Aug 2023 18:18:30 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.581775.911189 (Exim 4.92) (envelope-from ) id 1qTuJa-00063c-0Z; Thu, 10 Aug 2023 01:18:14 +0000 Received: by outflank-mailman (output) from mailman id 581775.911189; Thu, 10 Aug 2023 01:18:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qTuJZ-00063T-SH; Thu, 10 Aug 2023 01:18:13 +0000 Received: by outflank-mailman (input) for mailman id 581775; Thu, 10 Aug 2023 01:18:12 +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 1qTuJY-0005zH-4f for xen-devel@lists.xenproject.org; Thu, 10 Aug 2023 01:18:12 +0000 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c3d13540-371b-11ee-8613-37d641c3527e; Thu, 10 Aug 2023 03:18:09 +0200 (CEST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0A76864D23; Thu, 10 Aug 2023 01:18:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A41C6C433CA; Thu, 10 Aug 2023 01:18:06 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: c3d13540-371b-11ee-8613-37d641c3527e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691630287; bh=crHnn0Bq/eixmDIAlOgACBFKpTbRLyaaGW8boXXtf88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XdFxW5hfkrVceBkw56P8vvnT7f+YOeZFW1DVrKImOL5kJeH0VelYhj68qazSJzMn1 VHBghTz5vijJSnxDk3tXpVsyGBG98dXAIe+N+YVL0+cRFg4fr4M0rKac2qGHWYQJmC 4xOy2g1D6s0RkG2ioM4tlSQV76zQwug6z9/sihI2LiY/wyHKeB0XUj+NdfGCUJxlZn CrY89z/5nRlX6Ule0FeFsieG0kmjhL80czmcldOzc9AHqAAZFgS0+GPytZnTwHwUUQ wNB3HQAXOfKO+4G37pBrLPZb6vnx5GEOqN3fuJcvHxovkGF+RicXHLQrYwiCFaWv9R B+xfEOTXGSQWA== From: Stefano Stabellini To: michal.orzel@amd.com Cc: sstabellini@kernel.org, xen-devel@lists.xenproject.org, cardoe@cardoe.com, Stefano Stabellini Subject: [PATCH 2/2] automation: use Alpine 3.18 instead of 3.12 for all gitlab jobs Date: Wed, 9 Aug 2023 18:18:03 -0700 Message-Id: <20230810011803.311832-2-sstabellini@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1691630311934100001 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini Signed-off-by: Stefano Stabellini Reviewed-by: Michal Orzel --- automation/gitlab-ci/build.yaml | 64 ++++++++++++++++----------------- automation/gitlab-ci/test.yaml | 56 ++++++++++++++--------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.y= aml index af64a53ead..173613567c 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -273,9 +273,9 @@ =20 # Arm test artifacts =20 -alpine-3.12-arm64-rootfs-export: +alpine-3.18-arm64-rootfs-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.12-a= rm64v8 + image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18-a= rm64v8 script: - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz artifacts: @@ -319,9 +319,9 @@ qemu-system-aarch64-6.0.0-arm32-export: =20 # x86_64 test artifacts =20 -alpine-3.12-rootfs-export: +alpine-3.18-rootfs-export: extends: .test-jobs-artifact-common - image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.12 + image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18 script: - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz artifacts: @@ -345,15 +345,15 @@ kernel-6.1.19-export: =20 # Build jobs needed for tests =20 -alpine-3.12-gcc: +alpine-3.18-gcc: extends: .gcc-x86-64-build variables: - CONTAINER: alpine:3.12 + CONTAINER: alpine:3.18 =20 -alpine-3.12-gcc-debug: +alpine-3.18-gcc-debug: extends: .gcc-x86-64-build-debug variables: - CONTAINER: alpine:3.12 + CONTAINER: alpine:3.18 =20 debian-stretch-gcc-debug: extends: .gcc-x86-64-build-debug @@ -437,78 +437,78 @@ debian-unstable-gcc-debug-arm64-randconfig: CONTAINER: debian:unstable-arm64v8 RANDCONFIG: y =20 -alpine-3.12-gcc-arm64: +alpine-3.18-gcc-arm64: extends: .gcc-arm64-build variables: - CONTAINER: alpine:3.12-arm64v8 + CONTAINER: alpine:3.18-arm64v8 =20 -alpine-3.12-gcc-debug-arm64: +alpine-3.18-gcc-debug-arm64: extends: .gcc-arm64-build-debug variables: - CONTAINER: alpine:3.12-arm64v8 + CONTAINER: alpine:3.18-arm64v8 =20 -alpine-3.12-gcc-arm64-randconfig: +alpine-3.18-gcc-arm64-randconfig: extends: .gcc-arm64-build variables: - CONTAINER: alpine:3.12-arm64v8 + CONTAINER: alpine:3.18-arm64v8 RANDCONFIG: y =20 -alpine-3.12-gcc-debug-arm64-randconfig: +alpine-3.18-gcc-debug-arm64-randconfig: extends: .gcc-arm64-build-debug variables: - CONTAINER: alpine:3.12-arm64v8 + CONTAINER: alpine:3.18-arm64v8 RANDCONFIG: y =20 -alpine-3.12-gcc-arm64-staticmem: +alpine-3.18-gcc-arm64-staticmem: extends: .gcc-arm64-build variables: - CONTAINER: alpine:3.12-arm64v8 + CONTAINER: alpine:3.18-arm64v8 EXTRA_XEN_CONFIG: | CONFIG_EXPERT=3Dy CONFIG_UNSUPPORTED=3Dy CONFIG_STATIC_MEMORY=3Dy =20 -alpine-3.12-gcc-debug-arm64-staticmem: +alpine-3.18-gcc-debug-arm64-staticmem: extends: .gcc-arm64-build-debug variables: - CONTAINER: alpine:3.12-arm64v8 + CONTAINER: alpine:3.18-arm64v8 EXTRA_XEN_CONFIG: | CONFIG_EXPERT=3Dy CONFIG_UNSUPPORTED=3Dy CONFIG_STATIC_MEMORY=3Dy =20 -alpine-3.12-gcc-arm64-static-shared-mem: +alpine-3.18-gcc-arm64-static-shared-mem: extends: .gcc-arm64-build variables: - CONTAINER: alpine:3.12-arm64v8 + CONTAINER: alpine:3.18-arm64v8 EXTRA_XEN_CONFIG: | CONFIG_UNSUPPORTED=3Dy CONFIG_STATIC_MEMORY=3Dy CONFIG_STATIC_SHM=3Dy =20 -alpine-3.12-gcc-debug-arm64-static-shared-mem: +alpine-3.18-gcc-debug-arm64-static-shared-mem: extends: .gcc-arm64-build-debug variables: - CONTAINER: alpine:3.12-arm64v8 + CONTAINER: alpine:3.18-arm64v8 EXTRA_XEN_CONFIG: | CONFIG_UNSUPPORTED=3Dy CONFIG_STATIC_MEMORY=3Dy CONFIG_STATIC_SHM=3Dy =20 -alpine-3.12-gcc-arm64-boot-cpupools: +alpine-3.18-gcc-arm64-boot-cpupools: extends: .gcc-arm64-build variables: - CONTAINER: alpine:3.12-arm64v8 + CONTAINER: alpine:3.18-arm64v8 EXTRA_XEN_CONFIG: | CONFIG_EXPERT=3Dy CONFIG_UNSUPPORTED=3Dy CONFIG_SCHED_NULL=3Dy CONFIG_BOOT_TIME_CPUPOOLS=3Dy =20 -alpine-3.12-gcc-debug-arm64-boot-cpupools: +alpine-3.18-gcc-debug-arm64-boot-cpupools: extends: .gcc-arm64-build-debug variables: - CONTAINER: alpine:3.12-arm64v8 + CONTAINER: alpine:3.18-arm64v8 EXTRA_XEN_CONFIG: | CONFIG_BOOT_TIME_CPUPOOLS=3Dy =20 @@ -622,15 +622,15 @@ debian-unstable-gcc-arm64-cppcheck: =20 # Build jobs not needed for tests =20 -alpine-3.12-clang: +alpine-3.18-clang: extends: .clang-x86-64-build variables: - CONTAINER: alpine:3.12 + CONTAINER: alpine:3.18 =20 -alpine-3.12-clang-debug: +alpine-3.18-clang-debug: extends: .clang-x86-64-build-debug variables: - CONTAINER: alpine:3.12 + CONTAINER: alpine:3.18 =20 archlinux-gcc: extends: .gcc-x86-64-build diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 45e8ddb7a3..8ccce1fe26 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -8,7 +8,7 @@ - /^stable-.*/ =20 .arm64-test-needs: &arm64-test-needs - - alpine-3.12-arm64-rootfs-export + - alpine-3.18-arm64-rootfs-export - kernel-5.19-arm64-export - qemu-system-aarch64-6.0.0-arm64-export =20 @@ -16,7 +16,7 @@ - qemu-system-aarch64-6.0.0-arm32-export =20 .x86-64-test-needs: &x86-64-test-needs - - alpine-3.12-rootfs-export + - alpine-3.18-rootfs-export - kernel-6.1.19-export =20 .qemu-arm64: @@ -105,7 +105,7 @@ extends: .test-jobs-common variables: # the test controller runs on RPi4 - CONTAINER: alpine:3.12-arm64v8 + CONTAINER: alpine:3.18-arm64v8 LOGFILE: smoke-test.log PCIDEV: "03:00.0" PCIDEV_INTR: "MSI-X" @@ -155,7 +155,7 @@ xilinx-smoke-dom0less-arm64-gcc: - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh 2>&1 | tee ${LOG= FILE} needs: - *arm64-test-needs - - alpine-3.12-gcc-arm64 + - alpine-3.18-gcc-arm64 =20 xilinx-smoke-dom0less-arm64-gcc-gem-passthrough: extends: .xilinx-arm64 @@ -163,7 +163,7 @@ xilinx-smoke-dom0less-arm64-gcc-gem-passthrough: - ./automation/scripts/xilinx-smoke-dom0less-arm64.sh gem-passthrough = 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.12-gcc-arm64 + - alpine-3.18-gcc-arm64 =20 adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 @@ -171,7 +171,7 @@ adl-smoke-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.12-gcc-debug + - alpine-3.18-gcc-debug =20 adl-smoke-x86-64-dom0pvh-gcc-debug: extends: .adl-x86-64 @@ -179,7 +179,7 @@ adl-smoke-x86-64-dom0pvh-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.12-gcc-debug + - alpine-3.18-gcc-debug =20 adl-suspend-x86-64-gcc-debug: extends: .adl-x86-64 @@ -187,7 +187,7 @@ adl-suspend-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh s3 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.12-gcc-debug + - alpine-3.18-gcc-debug =20 adl-pci-pv-x86-64-gcc-debug: extends: .adl-x86-64 @@ -195,7 +195,7 @@ adl-pci-pv-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pci-pv 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.12-gcc-debug + - alpine-3.18-gcc-debug =20 adl-pci-hvm-x86-64-gcc-debug: extends: .adl-x86-64 @@ -205,7 +205,7 @@ adl-pci-hvm-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.12-gcc-debug + - alpine-3.18-gcc-debug =20 zen3p-smoke-x86-64-gcc-debug: extends: .zen3p-x86-64 @@ -213,7 +213,7 @@ zen3p-smoke-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.12-gcc-debug + - alpine-3.18-gcc-debug =20 zen3p-smoke-x86-64-dom0pvh-gcc-debug: extends: .zen3p-x86-64 @@ -221,7 +221,7 @@ zen3p-smoke-x86-64-dom0pvh-gcc-debug: - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.12-gcc-debug + - alpine-3.18-gcc-debug =20 zen3p-pci-hvm-x86-64-gcc-debug: extends: .zen3p-x86-64 @@ -229,7 +229,7 @@ zen3p-pci-hvm-x86-64-gcc-debug: - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.12-gcc-debug + - alpine-3.18-gcc-debug =20 qemu-smoke-dom0-arm64-gcc: extends: .qemu-arm64 @@ -237,7 +237,7 @@ qemu-smoke-dom0-arm64-gcc: - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.12-gcc-arm64 + - alpine-3.18-gcc-arm64 =20 qemu-smoke-dom0-arm64-gcc-debug: extends: .qemu-arm64 @@ -245,7 +245,7 @@ qemu-smoke-dom0-arm64-gcc-debug: - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.12-gcc-debug-arm64 + - alpine-3.18-gcc-debug-arm64 =20 qemu-smoke-dom0less-arm64-gcc: extends: .qemu-arm64 @@ -253,7 +253,7 @@ qemu-smoke-dom0less-arm64-gcc: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFI= LE} needs: - *arm64-test-needs - - alpine-3.12-gcc-arm64 + - alpine-3.18-gcc-arm64 =20 qemu-smoke-dom0less-arm64-gcc-debug: extends: .qemu-arm64 @@ -261,7 +261,7 @@ qemu-smoke-dom0less-arm64-gcc-debug: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFI= LE} needs: - *arm64-test-needs - - alpine-3.12-gcc-debug-arm64 + - alpine-3.18-gcc-debug-arm64 =20 qemu-smoke-dom0less-arm64-gcc-staticmem: extends: .qemu-arm64 @@ -269,7 +269,7 @@ qemu-smoke-dom0less-arm64-gcc-staticmem: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | = tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.12-gcc-arm64-staticmem + - alpine-3.18-gcc-arm64-staticmem =20 qemu-smoke-dom0less-arm64-gcc-debug-staticmem: extends: .qemu-arm64 @@ -277,7 +277,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-staticmem: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | = tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.12-gcc-debug-arm64-staticmem + - alpine-3.18-gcc-debug-arm64-staticmem =20 qemu-smoke-dom0less-arm64-gcc-staticheap: extends: .qemu-arm64 @@ -285,7 +285,7 @@ qemu-smoke-dom0less-arm64-gcc-staticheap: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-heap 2>&1 | = tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.12-gcc-arm64 + - alpine-3.18-gcc-arm64 =20 qemu-smoke-dom0less-arm64-gcc-debug-staticheap: extends: .qemu-arm64 @@ -293,7 +293,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-staticheap: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-heap 2>&1 | = tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.12-gcc-debug-arm64 + - alpine-3.18-gcc-debug-arm64 =20 qemu-smoke-dom0less-arm64-gcc-static-shared-mem: extends: .qemu-arm64 @@ -301,7 +301,7 @@ qemu-smoke-dom0less-arm64-gcc-static-shared-mem: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-shared-mem = 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.12-gcc-arm64-static-shared-mem + - alpine-3.18-gcc-arm64-static-shared-mem =20 qemu-smoke-dom0less-arm64-gcc-debug-static-shared-mem: extends: .qemu-arm64 @@ -309,7 +309,7 @@ qemu-smoke-dom0less-arm64-gcc-debug-static-shared-mem: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-shared-mem = 2>&1 | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.12-gcc-debug-arm64-static-shared-mem + - alpine-3.18-gcc-debug-arm64-static-shared-mem =20 qemu-smoke-dom0less-arm64-gcc-boot-cpupools: extends: .qemu-arm64 @@ -317,7 +317,7 @@ qemu-smoke-dom0less-arm64-gcc-boot-cpupools: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1= | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.12-gcc-arm64-boot-cpupools + - alpine-3.18-gcc-arm64-boot-cpupools =20 qemu-smoke-dom0less-arm64-gcc-debug-boot-cpupools: extends: .qemu-arm64 @@ -325,14 +325,14 @@ qemu-smoke-dom0less-arm64-gcc-debug-boot-cpupools: - ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1= | tee ${LOGFILE} needs: - *arm64-test-needs - - alpine-3.12-gcc-debug-arm64-boot-cpupools + - alpine-3.18-gcc-debug-arm64-boot-cpupools =20 qemu-xtf-dom0less-arm64-gcc-hyp-xen-version: extends: .qemu-arm64 script: - ./automation/scripts/qemu-xtf-dom0less-arm64.sh hyp-xen-version 2>&1= | tee ${LOGFILE} needs: - - alpine-3.12-gcc-arm64 + - alpine-3.18-gcc-arm64 - qemu-system-aarch64-6.0.0-arm64-export =20 qemu-xtf-dom0less-arm64-gcc-debug-hyp-xen-version: @@ -340,7 +340,7 @@ qemu-xtf-dom0less-arm64-gcc-debug-hyp-xen-version: script: - ./automation/scripts/qemu-xtf-dom0less-arm64.sh hyp-xen-version 2>&1= | tee ${LOGFILE} needs: - - alpine-3.12-gcc-debug-arm64 + - alpine-3.18-gcc-debug-arm64 - qemu-system-aarch64-6.0.0-arm64-export =20 qemu-smoke-dom0-arm32-gcc: @@ -421,7 +421,7 @@ qemu-alpine-x86_64-gcc: - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee ${LOGFILE} needs: - *x86-64-test-needs - - alpine-3.12-gcc + - alpine-3.18-gcc =20 qemu-smoke-x86-64-gcc: extends: .qemu-x86-64 --=20 2.25.1