From nobody Sun May 5 17:56:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502120735277418.6637317285472; Mon, 7 Aug 2017 08:45:35 -0700 (PDT) Received: from localhost ([::1]:38048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekDl-0002DE-Pa for importer@patchew.org; Mon, 07 Aug 2017 11:45:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek86-0004cS-9O for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek81-0006Wh-Jm for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:42 -0400 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:36556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek81-0006W2-CT for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:37 -0400 Received: by mail-wm0-x233.google.com with SMTP id t201so10325952wmt.1 for ; Mon, 07 Aug 2017 08:39:37 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 93sm12336281wra.82.2017.08.07.08.39.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:34 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7DB7E3E0268; Mon, 7 Aug 2017 16:39:34 +0100 (BST) 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=3HFch1EWRGn/6uh5F40O85V1Edv9RLZwoWa6B9YN0XE=; b=TDR1E5MZfn9FHIYqK1tA6d8cz9VJEnahgO+998X3bncByHhCh0GgkVfOPf0FIn5ydj u/tX80fY1HS6c0by/JN8HvKdziKHH0sZg15Zce9H88cD+Ij/pp1oISHBIhtb7q4dvmoH w6QJ+4xXXjnBoVTHZGIoG20rNgkDu3TN4I0Ic= 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=3HFch1EWRGn/6uh5F40O85V1Edv9RLZwoWa6B9YN0XE=; b=dz+9H7fhtcNXDc0m5hnFyN3ryXZphcjctV3K6apEplS/aQpQCC8PL9nnK7LDZDpsyG swCyLyIHoQnClipQ7PXH+n2BM9vKXGePWwtKvpQrjpIRsfubow5S3RSl5gepSUxsIarM NvfeNXLnTaJ3UL8nyENXz4wikp3wl+GSY1/1XXl1U8zYQnRmkcjrvs9oKUTyU+Dqc363 BffhAhZxjfFSlC6qdGALoIC+eZD6cgizgTLdmUTRSomcMlpmN/ojlCmopEsif9YysEmG wbqIAeeaFg+DoibGXndC2EaHdR+Mbx9IhCyB9rUSgPat7ngoJ5xuC15s87AENghO26+h NX2g== X-Gm-Message-State: AHYfb5icw2vqjweqsEbeOSfIkIFE90AdW5+cc5uf/xIjMKiSGATH5TeS lm8CNd8kTPb4dM9q X-Received: by 10.28.102.132 with SMTP id a126mr927142wmc.5.1502120376042; Mon, 07 Aug 2017 08:39:36 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:29 +0100 Message-Id: <20170807153934.29477-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::233 Subject: [Qemu-devel] [PATCH for 2.10 v3 1/6] docker: ensure NOUSER for travis 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , famz@redhat.com, qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 While adding the current user is a useful default behaviour for creating new images it is not appropriate for Travis which already has a default user. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index aaab1a4208..d7dafdbd27 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -71,6 +71,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9 docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian8-mxe docker-image-debian-win64-cross: docker-image-debian8-mxe +docker-image-travis: NOUSER=3D1 =20 # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(DOCKER_IMAGES), \ --=20 2.13.0 From nobody Sun May 5 17:56:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502120681102646.0215201794383; Mon, 7 Aug 2017 08:44:41 -0700 (PDT) Received: from localhost ([::1]:38040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekCt-0000iD-R8 for importer@patchew.org; Mon, 07 Aug 2017 11:44:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek88-0004eI-J8 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek83-0006YS-Ol for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:44 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:38092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek83-0006Xs-IX for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:39 -0400 Received: by mail-wm0-x230.google.com with SMTP id m85so10136285wma.1 for ; Mon, 07 Aug 2017 08:39:39 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l1sm10893876wmb.18.2017.08.07.08.39.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:34 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8E67D3E02F1; Mon, 7 Aug 2017 16:39:34 +0100 (BST) 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=BAdTOTXja9oZlrq5Oa016+DvPowCX3BY9IXz2teUulM=; b=CIaXbsgYj3ULCWQzvdIbFiq/fl8A2QOz1saah0O6kUbkW4Z6DpPI7fBnl7PCCFCh5Y CcU/njRXJSyxljfUIHGv2VLIClZusgbXuP7wXj7052ZWuTMQDBeKasRqRF1reZf0UIvV sbrKkxIhwGxAMrEnAgB64OfC2yAyu5P0kWkMg= 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=BAdTOTXja9oZlrq5Oa016+DvPowCX3BY9IXz2teUulM=; b=ZDa5UJujj7qc+zfrQ9dRHSnW5+7LluDq2dLCo9Q/1tnvhJZU8E/h0DI4iBdY692xbk BU+gVNMJtOHQzzcLhg1bSeZ8hGTDR8odOfX8c7WcXiPipqwJ78ymRkBa/iIpenODPBU4 mQtkLcw/V8z9rVQyQol36RipeMEHk4Q0/GbHy7nk6tIkte/Mf/P+VnmDv9/M41XLxJDx 3Kvnb99Caqo6yjVFb0phUpXOBIb+FpBQCRlGKxAlso0wyWWq8evBlNAH5jCfDctLXrFR OOmGOhTvGIPYDdH48hiCeDo5fSoA4AnVim45PsblnbhQX/HEJwtEv2xuo00kMIWilNUK PwVA== X-Gm-Message-State: AHYfb5g1/StikuZ0WwGgeq1rE6eR47EAxa1c/EH/sSV6rFZpj+fGPzdB Jv9ekSGeAjqJisRt X-Received: by 10.28.226.136 with SMTP id z130mr903928wmg.153.1502120378440; Mon, 07 Aug 2017 08:39:38 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:30 +0100 Message-Id: <20170807153934.29477-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::230 Subject: [Qemu-devel] [PATCH for 2.10 v3 2/6] docker: fix dirty/stash detection on some systems 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , famz@redhat.com, qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 I reported this a while ago but evidently forgot to push the patch upstream. Without this I wasn't seeing the dirty tree state submitted to the docker build which is very confusing. Reference: Subject: [PATCH 1/6] tests/docker/Makefile.include: fix diff-index call Date: Fri, 28 Oct 2016 17:33:34 +0100 Message-Id: <20161028163339.31096-2-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index d7dafdbd27..ff580edfad 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -20,7 +20,7 @@ IMAGES ?=3D % # Make archive from git repo $1 to tar.gz $2 make-archive-maybe =3D $(if $(wildcard $1/*), \ $(call quiet-command, \ - (cd $1; if git diff-index --quiet HEAD -- &>/dev/null; then \ + (cd $1; if git diff-index --quiet HEAD -- 2>/dev/null; then \ git archive -1 HEAD --format=3Dtar.gz; \ else \ git archive -1 $$(git stash create) --format=3Dtar.gz; \ --=20 2.13.0 From nobody Sun May 5 17:56:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502120894184840.6932019093803; Mon, 7 Aug 2017 08:48:14 -0700 (PDT) Received: from localhost ([::1]:38061 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekGK-0004PR-Sy for importer@patchew.org; Mon, 07 Aug 2017 11:48:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek8A-0004fB-0u for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek85-0006ZV-8J for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:46 -0400 Received: from mail-wr0-x231.google.com ([2a00:1450:400c:c0c::231]:33376) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek85-0006Ys-2B for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:41 -0400 Received: by mail-wr0-x231.google.com with SMTP id v105so3325195wrb.0 for ; Mon, 07 Aug 2017 08:39:40 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c34sm18996963wra.80.2017.08.07.08.39.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 9F7143E04E4; Mon, 7 Aug 2017 16:39:34 +0100 (BST) 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=0HMQNZm3VL870uU3kGRywoL/gavdjO/TYOrKDp2c+WQ=; b=WssuH5NUhfxobN/1rAMQShyYCtN6Y3aZcmMbrdxOMCTp1m3fggn9O1mHOI4NTuVW6e G1cteREbVRAerCzdFBiN8+9sD7fHNIazyE5oP7n+wwdLduWYNnKNcHH1/20yIfBNESE/ E7lFaMIDuRD9kVju/k8LxHnLR2yfGyMFjtDYc= 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=0HMQNZm3VL870uU3kGRywoL/gavdjO/TYOrKDp2c+WQ=; b=QDnqiQuY6yQSH9ew6voTTmXLZo/0+yajOIM2OdSaQ/A3woC2zjYQlW6xx/LvN3iD0b 8CBvPa0IT6VbCTH2GAphqtLgpmPfzV+TJMEoIS+TpTRqKGCNc6q9ruyrlK0bQ5vTYhRm pOkbIPeeWorkxyLK8/XEbaRPvhpPxXp3Kv8Qh1qNJgohGjvwI4mLj/aXbjdtfNZZBrAW RBX6ZY/e3+PcHTFXu4zHVNRLN0tD2e2YWSIZZ+l4NISCY00yx97bYVQFiZtTHmN92dGt 4eaVCnpAeJ/eyDqsbkp7FeISWGEfMnPqYCAGt+FLcJP5kPpENX0yLylqVJ7qUsajHejI tfGg== X-Gm-Message-State: AHYfb5ggIUMD2KBS6wFyjmsMLepz4hSq+7eBnzhdMvGFfVrW//K2tgb0 wunScYbSlDp2h3kg X-Received: by 10.223.136.78 with SMTP id e14mr698788wre.84.1502120379965; Mon, 07 Aug 2017 08:39:39 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:31 +0100 Message-Id: <20170807153934.29477-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::231 Subject: [Qemu-devel] [PATCH for 2.10 v3 3/6] docker: ignore submodules when checking diff 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , famz@redhat.com, qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 The QEMU tree often has dirty submodules in it but this will confuse things as git stash is not going to save their state directly. They are likely just dirty from build files anyway. Ignore them in the diff-index command. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Eric Blake --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ff580edfad..2a560a5327 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -20,7 +20,7 @@ IMAGES ?=3D % # Make archive from git repo $1 to tar.gz $2 make-archive-maybe =3D $(if $(wildcard $1/*), \ $(call quiet-command, \ - (cd $1; if git diff-index --quiet HEAD -- 2>/dev/null; then \ + (cd $1; if git diff-index --quiet --ignore-submodules HEAD -- 2>/dev/nul= l; then \ git archive -1 HEAD --format=3Dtar.gz; \ else \ git archive -1 $$(git stash create) --format=3Dtar.gz; \ --=20 2.13.0 From nobody Sun May 5 17:56:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502120678607125.05370150013368; Mon, 7 Aug 2017 08:44:38 -0700 (PDT) Received: from localhost ([::1]:38039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekCr-0000fI-8z for importer@patchew.org; Mon, 07 Aug 2017 11:44:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek8B-0004fz-27 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek86-0006ad-A7 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:47 -0400 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:35784) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek86-0006Zv-4T for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:42 -0400 Received: by mail-wr0-x22c.google.com with SMTP id k71so3229988wrc.2 for ; Mon, 07 Aug 2017 08:39:41 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i5sm10828971wmd.47.2017.08.07.08.39.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id AFA083E04EF; Mon, 7 Aug 2017 16:39:34 +0100 (BST) 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=zX55oopMfKp58Mp0S2zLwXspD9H7wd7hITYCTAOR7mQ=; b=elYUu0FXuwTtXUohUFTY4NkgIEKejF1WsW/H3HUHQ1k585YkqloQY1Bfvg9EO0NaJ5 LtDZZfjcxgXIWI0H9Xg6XoeWxSUzWAvSd9rnxgYdCEHGTQC74SCmfsdW0zPk48Z0xdXS qfyf77NoLDVbwj5UGQvjSNBKO7sXzl+7zRc/k= 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=zX55oopMfKp58Mp0S2zLwXspD9H7wd7hITYCTAOR7mQ=; b=SGFz+6KW1jvLm+Phwd28aQbdI073cVYdvkEjOPHrAnxTH4A49NdYlAIm1DR31JWuDB LigaMFcB/vUqyPtEvVqoKAyMhzkiwjLLRuzT/SpaEOlLamE/3aA9TdN11MrtveUdkYZo forTcv5R2OLiGQHAFhH6BP0XUMxauF6TDgjwwuYRKtWVzeiOC7zzPiOVrs0/5jngFoI0 Ri4VcjcV/7vpTzRq3kTK6V2ysswY8Pipwd6VlTtX+Tk+a2+9lRX+V7rmRqSdfp0nAT13 5mskiiyamXjm+rnaMvp5iuQrZ1nfVsPymCQAnPuVMbPOpz8SPG5eOSw0gVH7pmMpNr8x ykzA== X-Gm-Message-State: AHYfb5g95JMUk8wuPGB08FET4aPGe7XdINN4eKdcLaDAgcCz+AAC6nF5 09EBBl2E9Mw7Auh0KHXP7g== X-Received: by 10.223.170.217 with SMTP id i25mr684175wrc.140.1502120381039; Mon, 07 Aug 2017 08:39:41 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:32 +0100 Message-Id: <20170807153934.29477-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22c Subject: [Qemu-devel] [PATCH for 2.10 v3 4/6] docker: docker.py make --no-cache skip checksum test 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , famz@redhat.com, qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 If you invoke with NOCACHE=3D1 we pass --no-cache in the argv to docker.py but may still not force a rebuild if the dockerfile checksum hasn't changed. By testing for its presence we can force builds without having to manually remove the docker image. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index ee40ca04d9..aab1648cc5 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -261,7 +261,8 @@ class BuildCommand(SubCommand): tag =3D args.tag =20 dkr =3D Docker() - if dkr.image_matches_dockerfile(tag, dockerfile): + if "--no-cache" not in argv and \ + dkr.image_matches_dockerfile(tag, dockerfile): if not args.quiet: print "Image is up to date." else: --=20 2.13.0 From nobody Sun May 5 17:56:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502120832039976.0687745984807; Mon, 7 Aug 2017 08:47:12 -0700 (PDT) Received: from localhost ([::1]:38058 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekFK-0003fw-ME for importer@patchew.org; Mon, 07 Aug 2017 11:47:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek8C-0004hC-Ch for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek87-0006bh-Ch for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:48 -0400 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:35787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek87-0006ax-6N for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:43 -0400 Received: by mail-wr0-x22c.google.com with SMTP id k71so3230180wrc.2 for ; Mon, 07 Aug 2017 08:39:43 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u49sm9762819wrc.14.2017.08.07.08.39.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C091D3E04F1; Mon, 7 Aug 2017 16:39:34 +0100 (BST) 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=XIFJ409ohgeTvpR0LvqzWWDCJlIAxlaymrKZVoXpo28=; b=ivV/9MsvMgi1iP4H/1by++4gEEN/jR+qQ23lkipjpJBY05WfGW11Vxltw2/qaUPCmt 7hmr+tMr3WkONz5YL1Vq/UcHuBPCmbFEmxJu9gX9ASfWDOU/l8IuTCPFp00TWMVr144t Upai1yJjpdlHrh7jH1zWOgD7BdIaecR7+RlfQ= 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=XIFJ409ohgeTvpR0LvqzWWDCJlIAxlaymrKZVoXpo28=; b=G56qCzFBNmFfIcZZNhPoOTIhK1qGwcZ3AK79IPiircgQvcqUyCRHUjBblvUtpvbDPi xvD1EgbRZDWuDGrxXxBb1WuURH6z2lXV5ou+0nmXazZZ4Knj68bf4BcQbJSUo8K12tmf MvB6Dh0ObkQS7qB09C4ZcGO0kfRDAnUJiMqG51m+zMHdIz6NBDkGVEErrkooA1DRCak+ YygUltcPsSj/+Qv2Kl+6pyj1mFp0i3l6CenvcQCQZUPP54tv9/m30hNhhuUAd0QayH10 HJkHooi3t9u9nFg2L7sVLvUJhJDBYf7ASfQxqvZo1jLyvYsmhb7TX/2t8o4+SUfaf/jy QQcg== X-Gm-Message-State: AHYfb5iUeeKyuLeeOiuEN6CwvrnOqam3MUqivhipUfRSGVkzLKFiGuow Ygi5rJxNyg5kHC0oOD1BLA== X-Received: by 10.223.170.2 with SMTP id p2mr839930wrd.22.1502120382192; Mon, 07 Aug 2017 08:39:42 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:33 +0100 Message-Id: <20170807153934.29477-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22c Subject: [Qemu-devel] [PATCH for 2.10 v3 5/6] docker: don't install device-tree-compiler build-deps in travis.docker 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , famz@redhat.com, qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Installing the device-tree-compiler build-deps is a little extreme. We only actually need the binary so include it with the other packages. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/dockerfiles/travis.docker | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfi= les/travis.docker index 636fa590a5..57ac8e1419 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -1,6 +1,5 @@ FROM quay.io/travisci/travis-ruby RUN apt-get update RUN apt-get -y build-dep qemu -RUN apt-get -y build-dep device-tree-compiler -RUN apt-get -y install python2.7 python-yaml dh-autoreconf gdb strace lsof= net-tools +RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autor= econf gdb strace lsof net-tools ENV FEATURES pyyaml --=20 2.13.0 From nobody Sun May 5 17:56:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150212050929776.13639078909034; Mon, 7 Aug 2017 08:41:49 -0700 (PDT) Received: from localhost ([::1]:38011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekA8-0006cz-3l for importer@patchew.org; Mon, 07 Aug 2017 11:41:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek8F-0004jz-12 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek88-0006cw-RT for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:51 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:38121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek88-0006cI-LB for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:44 -0400 Received: by mail-wm0-x22c.google.com with SMTP id m85so10138225wma.1 for ; Mon, 07 Aug 2017 08:39:44 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u66sm13693789wrb.77.2017.08.07.08.39.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D0E4A3E0550; Mon, 7 Aug 2017 16:39:34 +0100 (BST) 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=yx2s9ujM23DVxb0ougXAWXQvT+zAb7b3PciVRAqkrW0=; b=D7gco90NeAseOLHyXtwYHvgosA001HHQd08j9Jfq04Ia8NCP4JGmi3exMVQqjfoDyo aC66dWb/DFCLnsU2NRSTE5crxP1/oKgGzJsSFiDxPFPGTv/e1KW9JJ2ewbwRvpTkcIt5 6qra5mMlySea9vPV7wHnJDNCCO2Ci/o5rt1Kw= 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=yx2s9ujM23DVxb0ougXAWXQvT+zAb7b3PciVRAqkrW0=; b=Kl3CrQyeUvDuS5HEBF4MaQgzK4+ek6+iDAvil1wqE6TOcLFcCo95LSYZDX8dos3W66 vrynpwQMKunnVo+5PTH6OzAlDyM+ZY9wdW4fxhvqL/OsvmZ1N8I+pMXnqnYj6mIFrYej yG+MbbG4Iy5WX+wWrf2p8T6S54zhGWB3jHwLPDWXYmXDHxWApUtPdQtPPbkoDzngBOY5 D/ka3eNsJwzcO2QpjiI4Ri8bx7/62+WgNHYA1uzQTFjQAoO4aKlFcAPeCOuWu9G+HfoI rLXFCu2EitSgSUz7uw7OJChh1tt0WTsEwim7ce5+y7vb080RoQ+yrfA2BZNpOqxrzj+i Mh0w== X-Gm-Message-State: AHYfb5gvNFMFppXh2FItLUjj6tmu2/zWsKtmivsL47dhAXaJd2ljcO07 L/vGwTS7IJU2vY0U X-Received: by 10.28.238.85 with SMTP id m82mr923990wmh.107.1502120383503; Mon, 07 Aug 2017 08:39:43 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:34 +0100 Message-Id: <20170807153934.29477-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22c Subject: [Qemu-devel] [PATCH for 2.10 v3 6/6] docker: reduce noise when building travis.docker 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , famz@redhat.com, qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Set the DEBIAN_FRONTEND and locale env vars to stop apt complaining so much as we build the image. See the Travis build logs where it is done by their scripts. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- v3 - one line env, drop LANG - add r-b and t-b tags --- tests/docker/dockerfiles/travis.docker | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfi= les/travis.docker index 57ac8e1419..03b7ef34de 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -1,4 +1,5 @@ FROM quay.io/travisci/travis-ruby +ENV DEBIAN_FRONTEND=3Dnoninteractive LC_ALL=3Den_US.UTF-8 RUN apt-get update RUN apt-get -y build-dep qemu RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autor= econf gdb strace lsof net-tools --=20 2.13.0