From patchwork Sun Oct 29 14:50:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 739055 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp743001wrt; Sun, 29 Oct 2023 07:53:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJ9M+8GkoHMVHhKa8JfyKl2rbwOAJAXYypqtZon+k3a3dK3GEdsEN+jchWHqIPZj164vV0 X-Received: by 2002:a25:db50:0:b0:d86:57cc:aa74 with SMTP id g77-20020a25db50000000b00d8657ccaa74mr6775856ybf.35.1698591194439; Sun, 29 Oct 2023 07:53:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698591194; cv=none; d=google.com; s=arc-20160816; b=NGDQnAcM3AK1sMfNmOzUzRa7F/QURKK718d0VlnxmcA3eZMDcjyKoVTfXHQ9K/B7yR C52lYy6lUs5jsFzVmIZwfGQiz++2T1c9xhLqjR4BE5bYO1HbGVgRhb13uYL2k0bbIMH2 B8Ow5ofmqUDw+Lg2PQdEm++9N3lxxi0rTZrw2YRSwxz8I/aM8Txxj7WM1K7wlTxJldbj mA9AYBWvKzaZE0Adxrr/iqqco3fK/blKBTddI0tT/1rdyIDzxbwD0AmzQ7SIyPDagcwq fD4dhOTAawvBcqnWwH9wkK6oGllI2yGwupWQD+Z9d6OqExFdpXnH4zoPInWXfNZ1mHeu iw/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uVl0amLRfGSvSjhVIa/kIq6GAW9b4gC6uASrU+KdCu0=; fh=xfTKN0dOWXSBe88Qf19pDztkyZ/4+zDTR3+/QiZRr4s=; b=v8C6FsYQRqj3S3sTS6FHeSlYoLM8vArAZlkakhoj+foSxyOgr4WojJVTRaWN8C3xKi 7E6Jy2RIEIooJILw1t0bETxsn3IMUyI+8PEERQ8PxWpH+EORIyD9CaBAgCbeoMfB8FaW 1zwfKJ1sWCH5JflRUhkteIu31nCobHkpfSUTPM4RJihSYpxA3VmZ2zCs0gzG74+re9f1 AVl5DAmkwJEIwvZ8WR7IS9bG4kRzDPgrineFJ9ZwtctDbXNcB9AUjwP01ul06wLzT87/ fO4VlnqeDsFAwexXDLOEV0CGTA7AdPY0Rw63DVY5bdtCXfaJ8tY0lE6COF6KeZTFSJNw f7dQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dD9krj0+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id pc3-20020a056214488300b0066dac72db9bsi4245299qvb.346.2023.10.29.07.53.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2023 07:53:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dD9krj0+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qx77o-0007WM-H0; Sun, 29 Oct 2023 10:50:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qx77k-0007RK-6g for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:44 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qx77f-00056C-D2 for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:43 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-32f7db21967so765143f8f.1 for ; Sun, 29 Oct 2023 07:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698591036; x=1699195836; darn=nongnu.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=uVl0amLRfGSvSjhVIa/kIq6GAW9b4gC6uASrU+KdCu0=; b=dD9krj0+Vg9hPyQdpefVIJxAnOLQOUdpwYjiFWVdfQ1a9XMGlueJBMmG/HXgCCrifx q5yF7pYALNlj8Du66QiI1ycuI0ICVxmqPlSyuLEIoCRYiWwuddB59wDbDInNHN2WD6NQ 4HUgSfm1RmVx1qTwtD296tjBZWrHUngiVi0xJ+/ggSDEm0O7Jse3DVj9TbxYInqBXOS4 lN89jghWsY/iqpw00PzqrHyLkjOEBGOfRCWBhYe9cDuA1fAviF4oGfjfFvxXlpftWDMD pmwxsBlaKjjpTxVkDb1i4vxhzhDaMehI4oq6E9tGbGs8rbUoF7B47KJB/3OY7f6VCZVP O6rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698591036; x=1699195836; 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=uVl0amLRfGSvSjhVIa/kIq6GAW9b4gC6uASrU+KdCu0=; b=t8bhzohMNmPgP9e/1Egc1parHYnpGKg3/T4PdZzPdaQ/RfS+XwvBv1Z3QC1tK4hciC 7iXT/w4O1jjgm7ICaeiB3Myw5TOKK2KfbL6QO2AAZTu9h8F01IBzbXVtN2TMsNib3Nr4 ym8BrKe560Abl3g936VKicO3o7uc/igGH8Yi8Mo34PTZdsJQsFB++38QAtd7+/Tfr7VQ IEzq5oeFVxDbHe/pNkOqkHgIGvXXHmyEhj/uBmbW9dSdpBeIRBRFGJCukPDrdYvDBdY0 +X0RZnMKc8sLXhEmhXNaIy47ZKtKePp5K36M0lyozaQVenbYBzDFekXw1SM/ttdvyu1S ktFA== X-Gm-Message-State: AOJu0YwRK6Ymw1lm0tjAqAOahIBg8i+Jdf/9cxjL5sY1qOzCzgVodgzM XS+IVUx0ZV6Y7BXcQuX8ZlOlmg== X-Received: by 2002:a5d:6643:0:b0:32f:8181:7d39 with SMTP id f3-20020a5d6643000000b0032f81817d39mr1334362wrw.9.1698591036706; Sun, 29 Oct 2023 07:50:36 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id bu3-20020a056000078300b0032dab20e773sm6200141wrb.69.2023.10.29.07.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 07:50:34 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 58A965F7A3; Sun, 29 Oct 2023 14:50:34 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Mahmoud Mandour , Wainer dos Santos Moschetta , Brad Smith , Aleksandar Rikalo , Kyle Evans , Aurelien Jarno , Jiaxun Yang , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Warner Losh , "Edgar E. Iglesias" , Eduardo Habkost , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Brian Cain , Alexandre Iooss Subject: [PATCH v2 03/19] gitlab: split alpha testing into a legacy container Date: Sun, 29 Oct 2023 14:50:17 +0000 Message-Id: <20231029145033.592566-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231029145033.592566-1-alex.bennee@linaro.org> References: <20231029145033.592566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The current bookworm compiler doesn't build the static binaries due to bug #1054412 and it might be awhile before it gets fixed. The problem of keeping older architecture compilers running isn't going to go away so lets prepare the ground. Create a legacy container and move some tests around so the others can get upgraded. Signed-off-by: Alex Bennée Message-Id: <20231028103311.347104-4-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- v2 - split other softmmu patches into a new patch --- .gitlab-ci.d/buildtest.yml | 19 ++++++-- .gitlab-ci.d/container-cross.yml | 6 +++ .../dockerfiles/debian-all-test-cross.docker | 4 +- .../debian-legacy-test-cross.docker | 46 +++++++++++++++++++ 4 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 tests/docker/dockerfiles/debian-legacy-test-cross.docker diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 25af1bc41e..bb24e052f6 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -256,6 +256,7 @@ build-user: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system + --target-list-exclude=alpha-linux-user MAKE_CHECK_ARGS: check-tcg build-user-static: @@ -265,6 +266,18 @@ build-user-static: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --disable-system --static + --target-list-exclude=alpha-linux-user + MAKE_CHECK_ARGS: check-tcg + +# targets stuck on older compilers +build-legacy: + extends: .native_build_job_template + needs: + job: amd64-debian-legacy-cross-container + variables: + IMAGE: debian-legacy-test-cross + TARGETS: alpha-linux-user alpha-softmmu + CONFIGURE_ARGS: --disable-tools MAKE_CHECK_ARGS: check-tcg build-user-hexagon: @@ -285,7 +298,7 @@ build-some-softmmu: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --disable-tools --enable-debug - TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu + TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu MAKE_CHECK_ARGS: check-tcg # We build tricore in a very minimal tricore only container @@ -318,7 +331,7 @@ clang-user: variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --cc=clang --cxx=clang++ --disable-system - --target-list-exclude=microblazeel-linux-user,aarch64_be-linux-user,i386-linux-user,m68k-linux-user,mipsn32el-linux-user,xtensaeb-linux-user + --target-list-exclude=alpha-linux-user,microblazeel-linux-user,aarch64_be-linux-user,i386-linux-user,m68k-linux-user,mipsn32el-linux-user,xtensaeb-linux-user --extra-cflags=-fsanitize=undefined --extra-cflags=-fno-sanitize-recover=undefined MAKE_CHECK_ARGS: check-unit check-tcg @@ -505,7 +518,7 @@ build-tci: variables: IMAGE: debian-all-test-cross script: - - TARGETS="aarch64 alpha arm hppa m68k microblaze ppc64 s390x x86_64" + - TARGETS="aarch64 arm hppa m68k microblaze ppc64 s390x x86_64" - mkdir build - cd build - ../configure --enable-tcg-interpreter --disable-docs --disable-gtk --disable-vnc diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 2848166ba3..80c540230a 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -16,6 +16,12 @@ amd64-debian-user-cross-container: variables: NAME: debian-all-test-cross +amd64-debian-legacy-cross-container: + extends: .container_job_template + stage: containers + variables: + NAME: debian-legacy-test-cross + arm64-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index 54e957d5e7..205173b0a5 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -28,8 +28,6 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ ninja-build \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ - gcc-alpha-linux-gnu \ - libc6.1-dev-alpha-cross \ gcc-arm-linux-gnueabihf \ libc6-dev-armhf-cross \ gcc-hppa-linux-gnu \ @@ -66,7 +64,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ RUN /usr/bin/pip3 install tomli ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools -ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user +ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-legacy-test-cross.docker b/tests/docker/dockerfiles/debian-legacy-test-cross.docker new file mode 100644 index 0000000000..763d36dfe3 --- /dev/null +++ b/tests/docker/dockerfiles/debian-legacy-test-cross.docker @@ -0,0 +1,46 @@ +# Docker legacy cross-compiler target (tests and minimal qemu) +# +# Compilers for some of our older targets which we cant currently +# upgrade. Currently: +# +# libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054412 +# +# As we are targeting check-tcg here we only need minimal qemu +# dependencies and the relevant cross compilers. + +FROM docker.io/library/debian:11-slim + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + apt build-dep -yy qemu + +# Add extra build tools and as many cross compilers as we can for testing +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + bison \ + ccache \ + clang \ + flex \ + git \ + ninja-build \ + gcc-alpha-linux-gnu \ + libc6.1-dev-alpha-cross \ + python3-pip \ + python3-setuptools \ + python3-venv \ + python3-wheel + +RUN /usr/bin/pip3 install tomli + +ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools +ENV DEF_TARGET_LIST alpha-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi