From patchwork Wed Nov 3 17:05:44 2021 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: 516783 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp899458iml; Wed, 3 Nov 2021 10:17:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx25uwHMFS9TOkmot1PqJR2A6d0uIoMU1/PEhNREo0YdwlzlIpgXGYfRAa7gsl7R7mwHmTK X-Received: by 2002:a05:6830:2805:: with SMTP id w5mr9610395otu.374.1635959840169; Wed, 03 Nov 2021 10:17:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635959840; cv=none; d=google.com; s=arc-20160816; b=RjCK6MYCF78PfRG/BUEEZJgAsx/0EZRamjoz01AJdxiFuEe615gL1kZpPmkaXaUz+s T7YBVCpG1jciPDIZ8zlyWFwXgfVNCvQOHuA/qxo17ZE7vfzqj+kfvGhFVAimHBOPhGb/ r+XW3d4UWovMFI8MKMJM7p4I0uGHGPksrhPplP/kHN7+CYGX407RSldIL2DAVtWrI1MP lWt0q+l0qKxUkjdM9+am66Y8qhCfq6l+dZXTKtet3yJ6xx7ABuLE+OiBK+bb6jMlydPj jJIJXBr0y2wUxO8GsI/fVUEmxt6/FIMtNmslj+ZOlLNsZXYaYNj31W4gvonnXmm/4Wcg 0lCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=LhCMj49V450oWkOKk125VLrGAzkn15HxQfeeMwD8j/0=; b=mAfG38nUawPd50C0/xZBTns9u5qWVQMC/fw16imT382aJIDsK9wsrBG3DK/Kyh+M12 oNfr/7EzfGLtAY29/v2dgBPxpPKmgWw1jawMdbvBp0K0M74TpDVh3BuXPSTH4ZezQhLd CK7EfeI2zOHuI6GVRxtkLctPMpZjzEbeBoSs9BjJoQFcAMgaynrjOYDf3iaSAEMHjtwv ZRR+NWyKE7hWaBVyEUcn2pqOFSisH6zpag4Ot1grT0fyJQm0fwXtccPHTQ4ujoUw/5BX mwRJZ9fZ2Oam7dGeJ2kz2BxIlnHUuuSB8pR3afeMdcuttbFYJHDYS6Wif3ZvmEiPDoRb AHpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=B1hx1u15; 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=fail (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 s3si3020311oig.131.2021.11.03.10.17.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Nov 2021 10:17:20 -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=fail header.i=@linaro.org header.s=google header.b=B1hx1u15; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miJt1-0005qr-GU for patch@linaro.org; Wed, 03 Nov 2021 13:17:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miJiM-0003qy-4u for qemu-devel@nongnu.org; Wed, 03 Nov 2021 13:06:18 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:56316) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miJiK-0003lZ-8L for qemu-devel@nongnu.org; Wed, 03 Nov 2021 13:06:17 -0400 Received: by mail-wm1-x334.google.com with SMTP id v127so2513692wme.5 for ; Wed, 03 Nov 2021 10:06:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LhCMj49V450oWkOKk125VLrGAzkn15HxQfeeMwD8j/0=; b=B1hx1u15oK++G9Yz/L54MoPanwALIbmx7eoaAIGjY+OUDbQ6Jy0Tiu2Y/jQDWnImm9 pdkCEzfn01DvuZ41gleIEnQqZ2GUwLikCYjvoXkQL5wleDHdSOxKB508ihF0kq950d3P tH6VXlsJTX2G9NNRu75VFWR5Ag+eH+AuREnHc1GNdY18bsj+Zl09jky/8zuFN25k/UDV mqLkO42vQHYsp4beAPZmBQCdRTNKREKCRGxdh9fw4OwxWGg324j12vhqZNaLzIfPI5F4 w1EbMkkrdsnFF2JCgktythTw8ooMqO7eSDU5qp0mH9KX5laLfEaasC8lCyjntKiCQduc N4rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LhCMj49V450oWkOKk125VLrGAzkn15HxQfeeMwD8j/0=; b=EIqV7yZI2J3yEgz13iewc0+roUVqPUauwCcdMSL+BREN1fNUr/LEnSs959mB/u2Xx5 1ekvwiKyFKVf+rdh6q5yGRu/aRl2MQD9Y2CMWI+7X4eOqodXaWEapPm1AT8xAblRIWB8 7sFJGq4e55fkSpvfKTa0HAIGjrsRpCN+6LHBm3/kYtjN4U4zDR33HpVS6nPFkTDpS34H R6ZIhN2yl+Qa2Uw3Yja7Qz8B2R15ZdKANm/gGePXK/g/C7DrGxCX5v5Mo5/EGZeTt4N1 MyiziquOmP2eUx6S7cFym9Xt/MJNrDRr4GbT/fx2KjQdcWveZIezP65aTJZYETaMfNe7 8RGQ== X-Gm-Message-State: AOAM5335MFE2PSKWvgm8yBxH+1z72huG3td9QeofcZ2u6Z2ofycWKz3G I7WGkOTq+txfD1PxLEB4dF9vnTfegjEEVg== X-Received: by 2002:a1c:1f06:: with SMTP id f6mr16548230wmf.55.1635959173760; Wed, 03 Nov 2021 10:06:13 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u15sm2812406wmq.12.2021.11.03.10.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 10:06:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 250B11FF9E; Wed, 3 Nov 2021 17:05:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 07/21] tests/docker: split PARTIAL into PARTIAL and VIRTUAL images Date: Wed, 3 Nov 2021 17:05:44 +0000 Message-Id: <20211103170558.717981-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211103170558.717981-1-alex.bennee@linaro.org> References: <20211103170558.717981-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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: , Cc: Thomas Huth , richard.henderson@linaro.org, qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is mostly to ensure we don't include the toolchain and bootstrap builds in DOCKER_IMAGES which is useful when verifying all images still build. Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo Reviewed-by: Richard Henderson Message-Id: <20211026102234.3961636-10-alex.bennee@linaro.org> -- 2.30.2 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e943ac33b0..5bbbaceed1 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -11,8 +11,10 @@ HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m)) DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian10 debian11 debian-bootstrap empty -DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))) +DOCKER_PARTIAL_IMAGES := debian10 debian11 +# we don't directly build virtual images (they are used to build other images) +DOCKER_VIRTUAL_IMAGES := debian-bootstrap debian-toolchain empty +DOCKER_IMAGES := $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache @@ -204,7 +206,7 @@ DOCKER_PARTIAL_IMAGES += fedora-cris-cross # packages. # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \ +$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES) $(DOCKER_VIRTUAL_IMAGES),$(DOCKER_IMAGES)), \ $(foreach t,$(DOCKER_TESTS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \