From patchwork Wed Mar 1 15:15:55 2023 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: 657809 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3544051wrb; Wed, 1 Mar 2023 07:17:47 -0800 (PST) X-Google-Smtp-Source: AK7set88m7zK1gsHM2BODNu2Gy/NS36mMPT2nFh2ukyPGjsuD/LOxK2fEw9ZbO/o+ssKNBSkV+zI X-Received: by 2002:a05:622a:1306:b0:3b8:525e:15ec with SMTP id v6-20020a05622a130600b003b8525e15ecmr12211848qtk.27.1677683867043; Wed, 01 Mar 2023 07:17:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677683867; cv=none; d=google.com; s=arc-20160816; b=Tex2CMwrlL1xfhl3fGnIBxGGelto5l81YRuPuK3g2awsf8gcoesjcdeR5P1qvT26Xb RZm5hQQtY3bgFhNUSJDTsVNmWkdB2OZQqNfgpYhDyJYoRDSdZvTlQOZJwpziuZwO7DTH DD81eCqbtYJNsz6zTmrfs3kMAHRGsQUdIz0/ldEsohyN/4T9i3n8k5wlrKdEcnQ9Vrzu i1u998Pu92hKmYEh3cHcstQM3BL08tZc2QeT3a3IqJAFb7Jvuo2NhmRhTNcLyEC2nyIa hBt7fxFhhrG28Jf1/rzrvAerB99r0JXWGjnxc5c1OGqJo2J/lnIofdg0rwYrlIl9aEIH 4sJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=AlywfJTD3Rvj2Q10jhHFgc9EYa6EV7ps8ZtC4o22SlU=; b=fDGN35VUJXwrCpPXiQf7eEtJLIfn9CHPuHELMtVisGSi/5FxTeX9jZzgSdKwVMjGab VYiwr1JEG6npnLRtmG+W91QciYmbeqDOzgpIjuKcJB7uhjLpTUy1hbBDU9/XiFSvJp+u X+G9ORO0uIyeWIRwIHsTvytQPKFocSjkp7wvL0M28keGk5fG2OF+32HrQ3eEtjb6VmnH hXU4FLaIXkuh7u8LpguS8C8hZC5S1zSsxhDpePLp4t5AXtlu0gnN6DFTCTdh10/unfkl mr9Ws+0icnlSJhqC1FHxg09givvpTt4BFJHUbNu7eE1AZ04tBu31r9LfMSHsnBIEbTqr ubGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BBTzH+v0; 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=pass (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 t188-20020a3746c5000000b00706674af640si10640629qka.403.2023.03.01.07.17.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:17:47 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=BBTzH+v0; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXOBo-0008Gb-VI; Wed, 01 Mar 2023 10:16:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXOBk-0008BG-Jx for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:16 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOBi-0007dV-9u for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:16:16 -0500 Received: by mail-wr1-x431.google.com with SMTP id h11so1853461wrm.5 for ; Wed, 01 Mar 2023 07:16:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AlywfJTD3Rvj2Q10jhHFgc9EYa6EV7ps8ZtC4o22SlU=; b=BBTzH+v0EBuhyiKJvSWVJ/lZvSRyXBeg4W5GGfjoS4dClYAxG0AgLE8TGq9PBp1pv4 QoZtcVRih6nvaCRdflvMisqz5zDcbfHrE59avARQeUCxEzSCh17zs/t5q++2vy2H2Mpm +Xo/N7LW7aOl98GDeGSe7OMZbOOaHG40Trir2Lab7W9wq+cnj9g9PafhkPfKuJlm6WVB 6Y8L3ug/HoD9gOsXcHd3trGtv8JNjRdnCTrCfDfgCCwuG6SqXiAysnqxng73bptHE0W2 G7ZYF9W9xaSC/9ABrWXdTK8LvQfDMAK0dDkKrewqSEmYOLhk6aHdu9R1DFqShGdCC0tZ v2Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AlywfJTD3Rvj2Q10jhHFgc9EYa6EV7ps8ZtC4o22SlU=; b=QO2BiRigv2Swn78TNqZVGrcHB0Dx0B6PE9abMI8tXlL22G4AbMMjb1xqh9uTvxipJ0 4XsiyMEkNEVaML2hcAnqdUL7/R93rd/cZBiqYfXeclLPXbhRnxWPj32hfVuBUK5noIQD X3s4JlEwPyjAik/68AZODJFAvTnrlxSmeN4Xzmy1x/SShN8wKlh3A6PiBjizmqipcGtF wU/g0MUxmfOnuVbg7IHVuLQZVNMlcvjc3nlEzzf1WvOkH3AjX3MtCZGH5DNg+IVQ9KQ9 BejDgyA3887ng+SwZdpy0UDkBiF4IZHgM3BLs1Iqy57gsmWl7onRNAsg7bVd/0zQ7nSM XVIg== X-Gm-Message-State: AO0yUKW51zzLupWyiWT3ddWzUPODfTPNSdZ6PqH3H6a0PIKX7339zPEG iI2oIP8zvRrWDUUX8FUWPRPyCA== X-Received: by 2002:a5d:5111:0:b0:2c7:1755:30bb with SMTP id s17-20020a5d5111000000b002c7175530bbmr5229103wrt.10.1677683772869; Wed, 01 Mar 2023 07:16:12 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v22-20020a1cf716000000b003e1fee8baacsm20099468wmh.25.2023.03.01.07.16.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:16:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 450491FFC5; Wed, 1 Mar 2023 15:16:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Fabiano Rosas , =?utf-8?q?Dan?= =?utf-8?q?iel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Alex_B?= =?utf-8?q?enn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 15/24] gitlab: Use plain docker in container-template.yml Date: Wed, 1 Mar 2023 15:15:55 +0000 Message-Id: <20230301151604.1948813-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Fabiano Rosas Our dockerfiles no longer reference layers from other qemu images so we can now use 'docker build' on them. Also reinstate the caching that was disabled due to bad interactions with certain runners. See commit 6ddc3dc7a8 ("tests/docker: don't use BUILDKIT in GitLab either"). We now believe those issues to be fixed. The COMMON_TAG needed to be fixed for the caching to work. The docker.py script was not using the variable, but constructing the correct URL directly. Signed-off-by: Fabiano Rosas Tested-by: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Message-Id: <20230227151110.31455-2-farosas@suse.de> Signed-off-by: Alex Bennée Message-Id: <20230228190653.1602033-16-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index c434b9c8f3..519b8a9482 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -6,17 +6,16 @@ - docker:dind before_script: - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/$NAME:latest" + - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - apk add python3 - docker info - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: - echo "TAG:$TAG" - echo "COMMON_TAG:$COMMON_TAG" - - ./tests/docker/docker.py --engine docker build - -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" - -r $CI_REGISTRY/qemu-project/qemu - - docker tag "qemu/$NAME" "$TAG" + - docker build --tag "$TAG" --cache-from "$TAG" --cache-from "$COMMON_TAG" + --build-arg BUILDKIT_INLINE_CACHE=1 + -f "tests/docker/dockerfiles/$NAME.docker" "." - docker push "$TAG" after_script: - docker logout