From patchwork Fri Jun 29 20:52:26 2018 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: 140655 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1312839ljj; Fri, 29 Jun 2018 14:10:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe/UkwSjul5tWq/5pZwgKRfIhrDHlKwu/i672A3XT6BDBmbhx9ifUSnJDNlzsEEsocIoS2M X-Received: by 2002:ac8:962:: with SMTP id z31-v6mr15490910qth.179.1530306659726; Fri, 29 Jun 2018 14:10:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306659; cv=none; d=google.com; s=arc-20160816; b=ZWgLeoTHA0mfsYMu2IFsfEYLwLBQnsvh91cCRmTDWdko4L+y8svYjsDcwlXAu6bj2W 2sipjl+UjBIPgvjA+79oKwWyW1/uOVAnHSg9vut4sDkm6vZDey1raiM+AgufBj9N1qqP GM5+5r9PaKjW2KU3qxOUa+g4d4N73p9Jqp6x+o8JH6YLmIYaICWTExc3rCMxk8msJDCB o0zgXw8x0ixgUq5L2XBC1kml68FFBTWGpyzs9HZQut3Omi6Rh5udVvkoDbAGIKtKBBhP sDv0DT6VHh3KBRU3IAky7qC1XFTOGC56YjE+IruCivHOJkBNtfBMmSBt67nN7opWfefE dl+Q== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=ewo2fwbxjOcKOOxFuWA4RALdrfTuEx8BVxLBsUtkmII=; b=cSOYKF+lu6uqjotORaZLYBVOHFlOLC8JEa9oOcbW7gwMm5kwwe8TKjlrFiFYFmtAFV z8kbHuOpCeL0dBjLEqIhK3wPr+DxixQUDK/XZO6NYemvMtxMiL283VdfG0CDzhkboE+f buWZvsgpBvJf+fkNFt+GgN8x1jczNP8h+DRdCnd5a2/BAM39KYpDPj0v9f67h8vQvcIJ i5W48zE6n4zIB7feDrshqDzUgt00L6W6TWD1X6lEwnJoseGU8JTrGbdbsbzrt/ffEPEQ Pc1QUE0Rahf09yLhqfPOYoRWA9RvyDi7w4gUBPhmy98R9z5h9W1vnLSHb9lKQImqi/jL 5Fuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QGobd5MI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o17-v6si2381757qvn.189.2018.06.29.14.10.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:10:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QGobd5MI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:44521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0fT-0008QE-7B for patch@linaro.org; Fri, 29 Jun 2018 17:10:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Sj-0004Gk-V7 for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Sf-0005Iz-Im for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:49 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:37505) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Sf-0005HQ-CH for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:45 -0400 Received: by mail-wr0-x244.google.com with SMTP id k6-v6so9990914wrp.4 for ; Fri, 29 Jun 2018 13:57:45 -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=ewo2fwbxjOcKOOxFuWA4RALdrfTuEx8BVxLBsUtkmII=; b=QGobd5MIHk0pDV6pFsvGqb9MIB/VIG0NSusOnxtamx+OqoFe+rBIKsIpfjpKG8BdS3 4l7rIA/XpEUnXFV2NK3JwmxYDMw6UfaN4xaerDp6Ulbwlx8zkRosAImLTZ3V0Frsokey DqyNo2GsfOxapAu+6rjVYIqt2PP6bWk2HYjqs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ewo2fwbxjOcKOOxFuWA4RALdrfTuEx8BVxLBsUtkmII=; b=ClZ3FxtXy3XCN0R82zG3DReQm6DwyD9OEQTqTKDO1zg1vmFmCnk4Zo05aJdJ1Hutix U4rPzYF7B3zzC3elW3Gck9NPQW/RA7toWHhYMWkHzNn6uiig2E1Iy3T4roxo3mqZSBc3 T6e3QIMZqdOWIviQXhTB+o0lONaxGlOwXLY6RsFoz0qBY3AW3hSi117qzQheGLwr8TDj sY7qcpWxdoxuMHflBbT77EPDJ+LOCk5Sfka5zGMgEtJPi2oI7pTL5zuJG+FL9pI4hRkS rmLCxtSA0Gy37K5eY3TI1ictucixu7trC2wuZsYQmPUmjS6HHRd5MvBflqId31s/INPM hZKA== X-Gm-Message-State: APt69E3c83g4uqmPapy4QsTv00n0rtU2gT3ygnX9G27vZEhech3aEHLl fhZkwejUwHvbquUbH948f1540Q== X-Received: by 2002:adf:92a5:: with SMTP id 34-v6mr14147406wrn.83.1530305864179; Fri, 29 Jun 2018 13:57:44 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i6-v6sm11490644wrr.2.2018.06.29.13.57.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:57:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id F32053E0B46; Fri, 29 Jun 2018 21:52:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 29 Jun 2018 21:52:26 +0100 Message-Id: <20180629205232.27190-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PATCH v2 15/21] docker: Do not run tests in 'intermediate' images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We can still build the DOCKER_INTERMEDIATE_IMAGES images, but they won't appear in 'make test*@$IMAGE'. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 1813ec0781..8641f5da2c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -5,6 +5,8 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES := debian +# we don't run tests on intermediate images (used as base by another image) +DOCKER_INTERMEDIATE_IMAGES := debian8 debian9 debian8-mxe debian-ports debian-sid DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(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 @@ -101,7 +103,7 @@ docker-image-travis: NOUSER=1 docker-image-tricore-cross: docker-image-debian9 # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ +$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \