From patchwork Tue Sep 20 17:15:26 2022 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: 607659 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2059311pvb; Tue, 20 Sep 2022 15:33:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4hXNKQ+xZgqjzeShvejhIQ+UI5wr5ypXVj3AMyT4omfWGPaVWylStNuyPLY3P973VlLlB5 X-Received: by 2002:a05:622a:1316:b0:35b:b629:5247 with SMTP id v22-20020a05622a131600b0035bb6295247mr21571685qtk.275.1663713237758; Tue, 20 Sep 2022 15:33:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663713237; cv=none; d=google.com; s=arc-20160816; b=eLH2Oi7gs0i9Tu/XvXQTsds7vv1tCqUceFVpjktQpGo2AFH7y9y3F8YhJ68mjbp76E ASLUrrrb6mlDAFiSzCCrPzpHQS5PjVr7/onu8PZQLxbFQQEDcYyf9KcmEDa/1vfdvWpZ pocxGEkforKkN/rRMzMTEPNHA2X73e15c2ZOFeG75kuSMT8gzMEgfguOGpctTW94yTD3 gyo31d6C6kDIkXhzljcIHbCQE73vpFlpbgJFANgR/bg4dLjeelPkDzwJqP2pnN823zHm RC4AlW60UgEl+85TMilHtu6Bj3JiJsw1FJtuHd/lEvS/3RBPdi1Y+M+W611OOkYO8uOx RsLQ== 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=+HHAGmPTEVaK8BLouLq5FfiutB4A/NBtflNNRIi+YP0=; b=thg/3/N7GEV0zXl8uZOcWubAj3srAZ3EFB2uVrwrv8rq0rwTBcP5MpaYk2lK+mCDKU Wi0qalW+j3R7FJIpGWIKWZFED0b6IcWS9O/dhWg9mUN5Tqkp1VeR4+d0hFu8/KLyNccH Eji5q1sTj+ZOFu3r27Hzi1Y4H2rG8U8b2b/ljIG/3pi1aJ6/MiS8SYvRJlS2//gZxMUN PRSMtyR4/TnVjCWQlXBYDGJ1TgIuT5m8dQyjM7fnm/b/J/Vk9NyUpatm+knLkDcsSV+o /qFGer6NHuYRayBvuSMChubiUJLOLeJJja36yP5tNzWNNlfhKqk0aTgBoCiWKITgjc3I PgqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZYtM23pB; 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 d22-20020ac85356000000b003437a690351si472281qto.175.2022.09.20.15.33.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:33:57 -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=ZYtM23pB; 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]:51844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaloT-0006J5-7y for patch@linaro.org; Tue, 20 Sep 2022 18:33:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzg-00068C-5Z for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:12 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:46906) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagze-00021N-Gm for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:11 -0400 Received: by mail-ed1-x52e.google.com with SMTP id z13so4812890edb.13 for ; Tue, 20 Sep 2022 10:25:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=+HHAGmPTEVaK8BLouLq5FfiutB4A/NBtflNNRIi+YP0=; b=ZYtM23pB/RlfGGkVj8PkOULLBQpEgqmqGuP4EZwn5vnCh/Uk38KM5dS3Aj6N+974Uj EincOuLBxWshGjN79jRwI7GXngY+y31PTOznG7KoxwN9gy8H+XcWDRkjA4/i4IZOCmpZ bCSEkIdfJkpb+iggUntCiNhQyh13N1EcH5Hi0h6MmyHbTWvWcttJepe43xD+SAoBWvxW Yv4Z8T8qrA3+Rv6NQhYhMzsWqce82ADrOA9KFL7EtSez0GrxIxAyOgRhAGjC9xjxbwke A7xnCi5CGv0SRFTg4u+oDW2mO784HbgF2GMr53pKMtwkjcykPVlMQxqwX1fABJnbPAhs E2FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=+HHAGmPTEVaK8BLouLq5FfiutB4A/NBtflNNRIi+YP0=; b=rczN8GoYgJy7NhEg4vxyefmK7GNnDVDFTo11a7X9HqRTTb9dG84ewSjW8rwlAOf9Vb ItWws5hK4ptQNHuJIUqsBX3T27GrZSUerYlZtlCu/9jwn0bIJCMmTiTSZvMwQVD456tJ LPcXUvu6BITYbG4VnE5yB7suBFQvR3eir9S3KjMpvNBppZ2H4rb+IrVTUs+rOpY35zV9 8sFRuVIvrU1PlcuutxKsCGI5ikVnNz6XTMIL96tIx3EShSSGJ8KNc7MYsQHeleIeSGDu h6DL1p+5VyGT4oZDH0qQCGGc8VYfAFngEpVYiKkjMbxmjjk9Zyy0k2F6GTJ5w+tuUtE/ 00oQ== X-Gm-Message-State: ACrzQf10ZnbSB4wH0dHzN6tB51VQSGl5sNLbWF5UZlFXeOR/S6jMkEqP V6MbfSmPc2YTvSXXxJUWZl1hQw== X-Received: by 2002:a05:6402:11d4:b0:452:a97c:cd36 with SMTP id j20-20020a05640211d400b00452a97ccd36mr21459262edw.53.1663694708993; Tue, 20 Sep 2022 10:25:08 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id w23-20020a170906385700b00780f6071b5dsm129581ejc.188.2022.09.20.10.24.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:25:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2B4311FFCE; Tue, 20 Sep 2022 18:15:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 23/30] tests/docker: update and flatten debian-all-test-cross Date: Tue, 20 Sep 2022 18:15:26 +0100 Message-Id: <20220920171533.1098094-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52e.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=ham 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" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We also need to ensure we install clang as it is used for those builds as well. It would be nice to port this to lcitool but for now this will do. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-24-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 3a8bd75473..091c0d8fcb 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -14,7 +14,6 @@ amd64-debian-cross-container: amd64-debian-user-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-all-test-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 24cd44e667..ddcc502049 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -129,7 +129,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # Specialist build images, sometimes very limited tools -docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index dedcea58b4..2beb077fb4 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -6,16 +6,24 @@ # basic compilers for as many targets as possible. We shall use this # to build and run linux-user tests on GitLab # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -# What we need to build QEMU itself -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ +# 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 the foreign architecture we want and install dependencies +# 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 \ + ccache \ + clang \ + git \ + ninja-build \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-alpha-linux-gnu \