From patchwork Tue Oct 31 14:43:50 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: 739579 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1688673wrt; Tue, 31 Oct 2023 07:48:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHW2/L/4eWvYVYbeFG/wreuos9rBGNJIZQVKqlRzNy7rBvnkm7rA2aOY4nncgFJQIHGKbqN X-Received: by 2002:a05:620a:29c5:b0:776:fba6:da64 with SMTP id s5-20020a05620a29c500b00776fba6da64mr15329411qkp.22.1698763691287; Tue, 31 Oct 2023 07:48:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698763691; cv=none; d=google.com; s=arc-20160816; b=L16+3udbKd7GfFyE+cgulbas/F9PFz5KJ2Z7bPAbLhHaARhcxTExZKmUMTst/BTcLn VInicxpumPnSv7lFRShrvlGujxl4UxlntYVQyMBQxEMfuECB8Itwmxa0Xmkp9HR/eDdv oLtHsHA91aHmBpvp/GzZoOrqqme4By/XWI+KyPKWIxVDA6iO05z+2ScstT7NHPiT39Vy 0uS/CnIuY+X6iMjVzYSbMXJS3UcP6gcr9PB/qDUo2r9K3hNQrAfaeUzJ1clOjX6lx0lI +mVjiA61D8r/mCinGOeeHiffIo9U1zMdfB0qGMr9aanrXkdmbjvirNEKJppYRwmeyLo8 FGQg== 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=iszDwQafh3cXdksSyYOnUK1+K3HqT7eMCMkWVLpPqWo=; fh=iQhuiDV2VMzZap4FvpkgpU0qMcJoW98sda1euw91HsY=; b=lDqxx/mfRQAdWn3gkN/7XA4SaR9EfpMsvvlxreDekwJ6/3LVuRfEFxd/qzSD6Mrq+I HMWeQAPbVn44QOhnr8TFJN2ZmNCalAYLIp7eQhc+ltowOHWOQVLzMu64SMLFxZOzsez7 3Ix9W8VR7/ARoMZ5kEFv/1zpeE+Fp4L+HB++UsEP+5rA9aKeNS0J/uC88oINI7Hvt+ej 0KFWnGfjTVxA5LRbGoBPlRUTl7riIdZuiWbfwNVGkdJ7nBrBTxsiecRYyDJEQsYR47C2 4dfivpaSmkHH08g+Y6PoBj3iIgwgXv9Cm9IHMhiN0CQQ36U1wdvs8H2IWSn6uGN+UneH yLgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="h4/z//nL"; 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 bp18-20020a05620a459200b0076f1797fa7csi1272924qkb.534.2023.10.31.07.48.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2023 07:48:11 -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="h4/z//nL"; 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 1qxpyZ-0004qC-T6; Tue, 31 Oct 2023 10:44:15 -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 1qxpyX-0004oq-RH for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:13 -0400 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxpyV-0002Aa-La for qemu-devel@nongnu.org; Tue, 31 Oct 2023 10:44:13 -0400 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2c50d1b9f22so74854271fa.0 for ; Tue, 31 Oct 2023 07:44:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698763450; x=1699368250; 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=iszDwQafh3cXdksSyYOnUK1+K3HqT7eMCMkWVLpPqWo=; b=h4/z//nLWv6huZqu5Ey14cai6hLgzwjUDcvwp4OsbCfhBAVHfXszHi+L8GErkZv+hh K+5M6zgWXzldgzPm8kPQ2a/Q5psYOrSTo60PsTjPRsR5Bu8Z7zeVuuOD+r601yxxaYy7 alCqAn67U0lzYIsiAz+FHX18BLO9PS6dgqiopNMUyIW2359DACA7sHVTkhP3NpBYijeF 0GwCrCgjatRkbiT+pfrRD8cSuhz0u8ARGk6Qg9uCYOnqXHpkDSBYa0JHrtIiv+16mIUt 9+lR0Lv1gGg9AwqW38AHl01TfG2M8WNYaikeuki3s3XHX818Na883cuceZG9iwSNjdSf 4LQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698763450; x=1699368250; 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=iszDwQafh3cXdksSyYOnUK1+K3HqT7eMCMkWVLpPqWo=; b=w/X85aFSiEJCAUMxnF+1jhGWYNjoxtb1fdNiXq9O/fAV3lrmm5sGBeWeI560qSCZrD V3mHrRuCFWiwDq9yKCj67sC/lzmhpR6Ky8DU/OstU6jJQibjri7qNZVAuZ9ttH1FrRsG UshHzuI3XCVt8A/i7Twr3DoyAssDcl9XZQYhLUNleoHeuMG2/kwGJOh46JhEMY/xBzc7 Cui3cfdXm5v5nGeEIW1ZHI7MTpFiYHqb8OYYVvSyGZk4ljcoB+Bintm5uChYOM9+3L3W lqzoCPyP2c4DoTXtWgS8ml+gBlNCsSKF9AdoYNN7j3SxvY2Ea5aBhhrOi97uHOOyl07R ZTMw== X-Gm-Message-State: AOJu0Yy7YdDTYvxDUYkqICRznWG2q9e7LN36GxPWTBSPhFsdw/N0ERf4 g9+7UL9WtSfEBK1mTZ6se8i4hA== X-Received: by 2002:a2e:9d8c:0:b0:2c4:ff2e:d6cd with SMTP id c12-20020a2e9d8c000000b002c4ff2ed6cdmr9984637ljj.2.1698763450063; Tue, 31 Oct 2023 07:44:10 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m18-20020adff392000000b0032daf848f68sm1645893wro.59.2023.10.31.07.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 07:44:05 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8F0EA6572A; Tue, 31 Oct 2023 14:44:02 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Paolo Bonzini Subject: [PULL 08/19] tests/docker: use debian-all-test-cross for power Date: Tue, 31 Oct 2023 14:43:50 +0000 Message-Id: <20231031144401.1238210-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031144401.1238210-1-alex.bennee@linaro.org> References: <20231031144401.1238210-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22f; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x22f.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, T_SCC_BODY_TEXT_LINE=-0.01 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-bounces+patch=linaro.org@nongnu.org Maintaining two sets of containers for test building is silly. While it makes sense for the QEMU cross-compile targets to have their own fat containers built by lcitool we might as well merge the other random debian based compilers into the same one used on gitlab. Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231029145033.592566-9-alex.bennee@linaro.org> diff --git a/configure b/configure index 37d1b10b87..96b01a280c 100755 --- a/configure +++ b/configure @@ -1325,14 +1325,13 @@ probe_target_compiler() { container_cross_prefix=nios2-linux-gnu- ;; ppc) - container_image=debian-powerpc-test-cross + container_image=debian-all-test-cross container_cross_prefix=powerpc-linux-gnu- container_cross_cc=${container_cross_prefix}gcc ;; ppc64|ppc64le) - container_image=debian-powerpc-test-cross + container_image=debian-all-test-cross container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu- - container_cross_cc=${container_cross_prefix}gcc-10 ;; sh4) container_image=debian-legacy-test-cross diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 3e6d741f62..a1dac0a45f 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -82,12 +82,6 @@ mipsel-debian-cross-container: variables: NAME: debian-mipsel-cross -powerpc-test-cross-container: - extends: .container_job_template - stage: containers - variables: - NAME: debian-powerpc-test-cross - ppc64el-debian-cross-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index f61d97102f..82e06d84b3 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -122,7 +122,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # These images may be good enough for building tests but not for test builds -DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross DOCKER_PARTIAL_IMAGES += debian-hppa-cross DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross diff --git a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker deleted file mode 100644 index 23779413d3..0000000000 --- a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker +++ /dev/null @@ -1,23 +0,0 @@ -# -# Docker powerpc/ppc64/ppc64le cross-compiler target -# -# This docker target builds on the Debian Bullseye base image. -# -FROM docker.io/library/debian:11-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - gcc-powerpc-linux-gnu \ - libc6-dev-powerpc-cross \ - gcc-10-powerpc64-linux-gnu \ - libc6-dev-ppc64-cross \ - gcc-10-powerpc64le-linux-gnu \ - libc6-dev-ppc64el-cross -# 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