{"id":808067,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808067/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170831064302.14427-13-famz@redhat.com>","date":"2017-08-31T06:43:02","name":"[v5,12/12] docker: Use archive-source.py","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4d5d37d63820de82e51f433d02f29f74f5dc2ea3","submitter":{"id":24872,"url":"http://patchwork.ozlabs.org/api/1.0/people/24872/?format=json","name":"Fam Zheng","email":"famz@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170831064302.14427-13-famz@redhat.com/mbox/","series":[{"id":753,"url":"http://patchwork.ozlabs.org/api/1.0/series/753/?format=json","date":"2017-08-31T06:42:50","name":"tests: Add VM based build tests (for non-x86_64 and/or non-Linux)","version":5,"mbox":"http://patchwork.ozlabs.org/series/753/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808067/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=famz@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjY2h1np5z9sMN\n\tfor ;\n\tThu, 31 Aug 2017 16:52:12 +1000 (AEST)","from localhost ([::1]:54192 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnJKk-00067S-9V\n\tfor incoming@patchwork.ozlabs.org; Thu, 31 Aug 2017 02:52:10 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:52283)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnJDT-0007n5-7Q\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 02:44:40 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnJDQ-0006xG-5y\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 02:44:39 -0400","from mx1.redhat.com ([209.132.183.28]:43638)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dnJDP-0006ws-Vz\n\tfor qemu-devel@nongnu.org; Thu, 31 Aug 2017 02:44:36 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id E4FBB7E433;\n\tThu, 31 Aug 2017 06:44:34 +0000 (UTC)","from lemon.redhat.com (ovpn-12-59.pek2.redhat.com [10.72.12.59])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id E0C3EA74A5;\n\tThu, 31 Aug 2017 06:44:26 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com E4FBB7E433","From":"Fam Zheng ","To":"qemu-devel@nongnu.org","Date":"Thu, 31 Aug 2017 14:43:02 +0800","Message-Id":"<20170831064302.14427-13-famz@redhat.com>","In-Reply-To":"<20170831064302.14427-1-famz@redhat.com>","References":"<20170831064302.14427-1-famz@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tThu, 31 Aug 2017 06:44:35 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v5 12/12] docker: Use archive-source.py","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Peter Maydell , Fam Zheng ,\n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n\tKamil Rytarowski , pbonzini@redhat.com, \n\tstefanha@redhat.com, Cleber Rosa ,\n\t=?utf-8?q?Alex_Benn=C3=A9e?= ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Fam Zheng \n---\n tests/docker/Makefile.include | 15 ++-------------\n tests/docker/run | 8 +-------\n 2 files changed, 3 insertions(+), 20 deletions(-)","diff":"diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include\nindex aaab1a4208..7a027d5bd6 100644\n--- a/tests/docker/Makefile.include\n+++ b/tests/docker/Makefile.include\n@@ -17,24 +17,13 @@ DOCKER_TOOLS := travis\n TESTS ?= %\n IMAGES ?= %\n \n-# Make archive from git repo $1 to tar.gz $2\n-make-archive-maybe = $(if $(wildcard $1/*), \\\n-\t$(call quiet-command, \\\n-\t\t(cd $1; if git diff-index --quiet HEAD -- &>/dev/null; then \\\n-\t\t\tgit archive -1 HEAD --format=tar.gz; \\\n-\t\telse \\\n-\t\t\tgit archive -1 $$(git stash create) --format=tar.gz; \\\n-\t\tfi) > $2, \\\n-\t\t\"ARCHIVE\",\"$(notdir $2)\"))\n-\n CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$)\n DOCKER_SRC_COPY := docker-src.$(CUR_TIME)\n \n $(DOCKER_SRC_COPY):\n \t@mkdir $@\n-\t$(call make-archive-maybe, $(SRC_PATH), $@/qemu.tgz)\n-\t$(call make-archive-maybe, $(SRC_PATH)/dtc, $@/dtc.tgz)\n-\t$(call make-archive-maybe, $(SRC_PATH)/pixman, $@/pixman.tgz)\n+\t$(call quiet-command, $(SRC_PATH)/scripts/archive-source.sh $@/qemu.tar, \\\n+\t\t\"GEN\", \"$@/qemu.tar\")\n \t$(call quiet-command, cp $(SRC_PATH)/tests/docker/run $@/run, \\\n \t\t\"COPY\",\"RUNNER\")\n \ndiff --git a/tests/docker/run b/tests/docker/run\nindex c1e4513bce..9eb9165f76 100755\n--- a/tests/docker/run\n+++ b/tests/docker/run\n@@ -32,13 +32,7 @@ export TEST_DIR=/tmp/qemu-test\n mkdir -p $TEST_DIR/{src,build,install}\n \n # Extract the source tarballs\n-tar -C $TEST_DIR/src -xzf $BASE/qemu.tgz\n-for p in dtc pixman; do\n- if test -f $BASE/$p.tgz; then\n- tar -C $TEST_DIR/src/$p -xzf $BASE/$p.tgz\n- export FEATURES=\"$FEATURES $p\"\n- fi\n-done\n+tar -C $TEST_DIR/src -xf $BASE/qemu.tar\n \n if test -n \"$SHOW_ENV\"; then\n if test -f /packages.txt; then\n","prefixes":["v5","12/12"]}