From patchwork Wed Jul 1 13:56:36 2020 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: 192150 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp526366ilg; Wed, 1 Jul 2020 07:06:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIWRjklqUyEqnU7wXDrvmc2rdE9ymIh19zharIh7bjj9m6co6Jzd1FsOoQl8lEw3SMLn57 X-Received: by 2002:a05:6214:3ec:: with SMTP id cf12mr25706845qvb.251.1593612397566; Wed, 01 Jul 2020 07:06:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593612397; cv=none; d=google.com; s=arc-20160816; b=ZwsgzePVSfIu+x+HeZftEMXSabUqtZvsp7JVdqgm5twmp4TU7BJkLy202PIVOOPVRa ikNa0uEflbtJzYNRJ8VZfSDbpr6//XtqKFnxxwzlbPVySn1cDXa8OzlhGcIOwMe4JbSJ G28J8HAUHFX5kNAfThpd3ho2atwi0uOcUGMvWj2GzYFVQqwIdpduZ4l5eP9vbu/6k+ZB /QcGhFaPQmz6nr3nVqLb5iQYz2lmYjEbnPikdhT5FOMhx2j41Sy5BmSZpAX0LWTFJKGA Fpw6Hi8rcIi6VUjZJukmxY23go4zKmSL3y3b7vLD5xhJulv9w7mMmRQed4vjNS/vCkdO Hm3w== 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=ZQXPMBJFSRwRAMpnVcrqX7aTAD1ChFBfvwEUcI3QHF8=; b=d2haPVAfAGBFKGx9OeFEGjd2VXntzgGJC7c/s7tFOEV2n8nWL2SY5KlBtCaSOnI4Bv ymZMsdS4z7KZumFW9qPgZTe0paRLsoVyQod8NCKtO0LpXm1sIMW6aNilyPEARq3wqUsT YlYJ/NZgwN3IbSYozpeAsHgwaZvuqfM7kefxHTcBytIgq1sZapkta0qvmn6dQ0swhxAP MAn9t3vQ/bdpG2t9BeUpUyiAu+WmqOOhpXJkSVFmeeyaq14PXbkhzJGYA4RMl1u6vWQw qNQQXboLgVZmKfjFuJ5P0ueB09MSCRBXTb4P1jrpb7Wz7VZ3y5aWLVrVkaeWEPZG1ymL T9Ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QV9lfwcP; 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 d80si5239192ybh.484.2020.07.01.07.06.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jul 2020 07:06:37 -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=QV9lfwcP; 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]:35892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdNk-0001R2-MH for patch@linaro.org; Wed, 01 Jul 2020 10:06:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdEf-0002Wu-RR for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:15 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdEb-0005sN-VL for qemu-devel@nongnu.org; Wed, 01 Jul 2020 09:57:13 -0400 Received: by mail-wr1-x443.google.com with SMTP id o11so23963673wrv.9 for ; Wed, 01 Jul 2020 06:57:09 -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=ZQXPMBJFSRwRAMpnVcrqX7aTAD1ChFBfvwEUcI3QHF8=; b=QV9lfwcPg8Ttws8CsGNaD1CPyYpwfk+XUjlDyReZPoF9eZo0F4/F/8DvpURdMKCLci 1rDiqEbCpKFgMKAjfmPCCw/r5SHqeiGbFYWBI03AA3zI4qup9+aabS6qoovj0UChcP0U HCOuWUErC8QxVOWUYXbSXDVKAK1MKg0rQ5SiQ11FB42E3lBfHPP5qJsJwL33K434TFc4 u6ZB6K3WeTmDK+98niCm3P1Usd4Xr6czgUgW5NHrGBs3OPWRXTNQaKcnW44h4J9bMsI6 Lsdbu4+D/qq+jCPGE4PmdCBP35r0oNjHrn69XjLG/BYYyBwQScl8c+rxrbOIIj0AucOk BolQ== 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=ZQXPMBJFSRwRAMpnVcrqX7aTAD1ChFBfvwEUcI3QHF8=; b=exK2T2MdWS6aFBy21shNs5k4lOpcVBAsMoKKdhNxF9a3cj3/5f7B9aOzanPwG/HtWs QIZ92bNIJ3HVyohVrHSbQRWbPiasTJwgV9S4+5l3MmjFlhESWOygmGR42QSdU8k7mOkr aHQFFkfpivQaV7tfQQrcm8UV5pitoRSFTZxGD+53bgjnk+gy+bUkvd9DmzRnVg48oa7M iee8oELghmd4lHgpdnFfoU5roRd5847v5DmorVg8l5K7Jz8lC8umT059ifXVHSxPmkir IhhUdSVV45M2Rpnvt8SyHE4TBN02kMPSpBfP8uMdI5IAqjeFMLJZccGdm/z0OFD37XYP WuIg== X-Gm-Message-State: AOAM530Au7MmRUBIxpcYWsaACh9HeORlW74xHo7+0uGrBvVDacqoUYkS jFGyrIkGEI/e5IvX5LVwUB9Gvw== X-Received: by 2002:adf:f311:: with SMTP id i17mr28013335wro.237.1593611828585; Wed, 01 Jul 2020 06:57:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n5sm7285076wmi.34.2020.07.01.06.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 06:57:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5CFEB1FFAE; Wed, 1 Jul 2020 14:56:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 24/40] tests/docker: add --registry support to tooling Date: Wed, 1 Jul 2020 14:56:36 +0100 Message-Id: <20200701135652.1366-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This allows us to point the tools towards a registry from which they can grab pre-built layers instead of doing everything from scratch each time. To enable this we need to be using the DOCKER_BUILDKIT engine. [AJB: note registry.gitlab.com/stsquad/qemu is for my testing, the final version will see DOCKER_REGISTRY default to registry.gitlab.com/qemu-project/qemu] Signed-off-by: Alex Bennée --- v2 - add a pull stage to pull images from the registry - enable BUILDKIT and BUILDKIT_INLINE_CACHE - don't invoke BUILDKIT on Travis v4 - Don't pass --registry in the NOCACHE case - precalc checksum before doing any replace steps --- tests/docker/Makefile.include | 6 ++++- tests/docker/docker.py | 44 ++++++++++++++++++++++++++++++----- 2 files changed, 43 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e23b4af20ea..977d8ff6e40 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -13,6 +13,7 @@ DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.doc 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 +DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),registry.gitlab.com/stsquad/qemu) DOCKER_TESTS := $(notdir $(shell \ find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) @@ -56,7 +57,9 @@ else docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command,\ $(DOCKER_SCRIPT) build -t qemu/$* -f $< \ - $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $V,,--quiet) \ + $(if $(NOCACHE),--no-cache, \ + $(if $(DOCKER_REGISTRY),--registry $(DOCKER_REGISTRY))) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ @@ -213,6 +216,7 @@ endif @echo ' Include extra files in image.' @echo ' ENGINE=auto/docker/podman' @echo ' Specify which container engine to run.' + @echo ' REGISTRY=url Cache builds from registry (default:$(DOCKER_REGISTRY))' # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make diff --git a/tests/docker/docker.py b/tests/docker/docker.py index cc6f76caa60..9684f07bdeb 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -221,6 +221,13 @@ class Docker(object): """ Running Docker commands """ def __init__(self): self._command = _guess_engine_command() + + if "docker" in self._command and "TRAVIS" not in os.environ: + os.environ["DOCKER_BUILDKIT"] = "1" + self._buildkit = True + else: + self._buildkit = False + self._instance = None atexit.register(self._kill_instances) signal.signal(signal.SIGTERM, self._kill_instances) @@ -289,10 +296,24 @@ class Docker(object): return labels.get("com.qemu.dockerfile-checksum", "") def build_image(self, tag, docker_dir, dockerfile, - quiet=True, user=False, argv=None, extra_files_cksum=[]): + quiet=True, user=False, argv=None, registry=None, + extra_files_cksum=[]): if argv is None: argv = [] + # pre-calculate the docker checksum before any + # substitutions we make for caching + checksum = _text_checksum(_dockerfile_preprocess(dockerfile)) + + if registry is not None: + dockerfile = dockerfile.replace("FROM qemu/", + "FROM %s/qemu/" % + (registry)) + # see if we can fetch a cache copy, may fail... + pull_args = ["pull", "%s/%s" % (registry, tag)] + self._do(pull_args, quiet=quiet) + + tmp_df = tempfile.NamedTemporaryFile(mode="w+t", encoding='utf-8', dir=docker_dir, suffix=".docker") @@ -306,15 +327,23 @@ class Docker(object): (uname, uid, uname)) tmp_df.write("\n") - tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % - _text_checksum(_dockerfile_preprocess(dockerfile))) + tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % (checksum)) for f, c in extra_files_cksum: tmp_df.write("LABEL com.qemu.%s-checksum=%s" % (f, c)) tmp_df.flush() - self._do_check(["build", "-t", tag, "-f", tmp_df.name] + argv + - [docker_dir], + build_args = ["build", "-t", tag, "-f", tmp_df.name] + if self._buildkit: + build_args += ["--build-arg", "BUILDKIT_INLINE_CACHE=1"] + + if registry is not None: + cache = "%s/%s" % (registry, tag) + build_args += ["--cache-from", cache] + build_args += argv + build_args += [docker_dir] + + self._do_check(build_args, quiet=quiet) def update_image(self, tag, tarball, quiet=True): @@ -403,6 +432,8 @@ class BuildCommand(SubCommand): parser.add_argument("--add-current-user", "-u", dest="user", action="store_true", help="Add the current user to image's passwd") + parser.add_argument("--registry", "-r", + help="cache from docker registry") parser.add_argument("-t", dest="tag", help="Image Tag") parser.add_argument("-f", dest="dockerfile", @@ -458,7 +489,8 @@ class BuildCommand(SubCommand): for k, v in os.environ.items() if k.lower() in FILTERED_ENV_NAMES] dkr.build_image(tag, docker_dir, dockerfile, - quiet=args.quiet, user=args.user, argv=argv, + quiet=args.quiet, user=args.user, + argv=argv, registry=args.registry, extra_files_cksum=cksum) rmtree(docker_dir)