From nobody Tue May 14 11:41:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1677243304; cv=none; d=zohomail.com; s=zohoarc; b=boYbcUN4U3AAnrHceqb3Ip+ABf/NFB+LrnhuV2jC1t+YjZRBKC3saQwOR975qXwy/jJmPblFBcEA2QOrhTgFTXLllTRNVdq8KnJFjuQUVPAdwvXSFnDq+1miqA5UeNmRvrACCaL1ESh8Kgo+FswBn8u53Q247xqE2rULnG/jRc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677243304; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XiYcd1Gc7E8pSyEhEzEMXAWtL+i/FCkGRuMGRP42AGM=; b=HNi0diifSc8CFjzal9o0MuEly3GMCFPxefqXEM0ULZJEz+s/VDdZwFzv3HEKM03J8ysV3EIJv4E4ED/b0TocN7GLS61Q53WIiPjYgXVllBT4BeU4+Q8UPPmFhGHdoZxkoiKvV8tw8FXL72cPM4QgMaFx+3fw8SLrHYD4DkoBHCY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677243304436736.738602416033; Fri, 24 Feb 2023 04:55:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVXad-0007hQ-TN; Fri, 24 Feb 2023 07:54:19 -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 1pVXac-0007h2-2M for qemu-devel@nongnu.org; Fri, 24 Feb 2023 07:54:18 -0500 Received: from smtp-out2.suse.de ([195.135.220.29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVXaa-0004Uc-Ge for qemu-devel@nongnu.org; Fri, 24 Feb 2023 07:54:17 -0500 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D4033607B6; Fri, 24 Feb 2023 12:54:14 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id CEB6413A3A; Fri, 24 Feb 2023 12:54:12 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id yP53JXSz+GMHMwAAMHmgww (envelope-from ); Fri, 24 Feb 2023 12:54:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1677243254; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XiYcd1Gc7E8pSyEhEzEMXAWtL+i/FCkGRuMGRP42AGM=; b=lLTYR67bApzzE/VbiBYqgLPIWttMSBODDL3eUDSk+p8og0IHhZdoYKThuP9vT9fblBBe47 8icxoeOzyJaw5rl9b5YHzv0XvWUdbHzIBju7iv7by1esM0fO3E1w4FK7d5Hiwhtg2xCyTl 04lDEZ7H4rcfkdEqsWeJQjlqxa5YZ28= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1677243254; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XiYcd1Gc7E8pSyEhEzEMXAWtL+i/FCkGRuMGRP42AGM=; b=cc5XYyWSbqfYDbXlKvlsg0Z02Y1hXPvsGVcPldOh+JBPMDFUxPEiUvOmKxWzbW3HifvA4G ko5j2pNZ4NNzTcBA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [RFC PATCH v2 1/3] gitlab: Use plain docker in container-template.yml Date: Fri, 24 Feb 2023 09:52:05 -0300 Message-Id: <20230224125207.19616-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230224125207.19616-1-farosas@suse.de> References: <20230224125207.19616-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.220.29; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1677243306101100003 Content-Type: text/plain; charset="utf-8" Our dockerfiles no longer reference layers from other qemu images so we can now use 'docker build' on them. Signed-off-by: Fabiano Rosas --- .gitlab-ci.d/container-template.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-t= emplate.yml index c434b9c8f3..f417452212 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -13,10 +13,7 @@ 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 -f "tests/docker/dockerfiles/$NAME.docker" "= ." - docker push "$TAG" after_script: - docker logout --=20 2.35.3 From nobody Tue May 14 11:41:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1677243299; cv=none; d=zohomail.com; s=zohoarc; b=NI4s6hhhLm1ntbuYf+rmQeKyvlmEKERRSZbrmi+u0SrfjC6UYkxsZ6Jof2JjCIiep/puQdivghM17ogm/h7AGZ6tLYRq0ZqNetfhNBqlD3679VxdiUM1oGiDjfroI2mCicQ0RZbGlR1bGBh0V8DrwMoIJFmx7BDTY01B9HEMMZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677243299; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4PDy3VtTtwyiAlGvHNLCCrWGyO7xsurS4tGZb222Iw8=; b=Tc5qPeFQjzlz5FUKe/w7+JtrD4KsIq7k8o7k29wzEm0lFSYXwb3RMQ5JpCwUaTa0AxYQ980fpLJSDtHKKml/VfJpZzuwmwSWDO7P6+n/ETP2ka2FAVqlaSy11fLE3JdOEcfyNkPMxfLwyTdfP2Wuj91mGJzQQgtuh5T7tChLb4k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677243299671941.8369042957819; Fri, 24 Feb 2023 04:54:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVXaf-0007hm-Jy; Fri, 24 Feb 2023 07:54:21 -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 1pVXae-0007hc-7q for qemu-devel@nongnu.org; Fri, 24 Feb 2023 07:54:20 -0500 Received: from smtp-out1.suse.de ([2001:67c:2178:6::1c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVXac-0004dk-GJ for qemu-devel@nongnu.org; Fri, 24 Feb 2023 07:54:19 -0500 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4F37237F07; Fri, 24 Feb 2023 12:54:17 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 4BDF413A3A; Fri, 24 Feb 2023 12:54:15 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id WIt2BXez+GMHMwAAMHmgww (envelope-from ); Fri, 24 Feb 2023 12:54:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1677243257; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4PDy3VtTtwyiAlGvHNLCCrWGyO7xsurS4tGZb222Iw8=; b=nTlWKB1HfAkFeaO9LZ0oM9WjVLWwVTc7rrU7b0KDzA/P8boyQDwkTc7a6LpIVmG5tIPS9V MHzADJPBOjoAwgBjqSVE61qL1S0/0q7AprGQXZbfM3/zwTuBkQHBHr4QUltmv4TvFDILdd 9KxevVba/J9Rf7sHco6kJTnwm2fS6Q0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1677243257; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4PDy3VtTtwyiAlGvHNLCCrWGyO7xsurS4tGZb222Iw8=; b=VL+6gX8ryZryGEy3unys+FnmW2BGBQFw2Tl2QLU//scyF3UFFRYDRZKJ9PEqHiMYKfH6ag hulv3U0cZdJVaGCA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [RFC PATCH v2 2/3] gitlab: Cache container images Date: Fri, 24 Feb 2023 09:52:06 -0300 Message-Id: <20230224125207.19616-3-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230224125207.19616-1-farosas@suse.de> References: <20230224125207.19616-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:67c:2178:6::1c; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1677243300143100001 Content-Type: text/plain; charset="utf-8" Make use of the --cache-from option from 'docker build' by including build layers when building and then pulling a previously built image before the next build. This was previously done by the docker.py script, but got 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, so restore the caching functionality as it brings a significant reduction in container build times. Signed-off-by: Fabiano Rosas --- .gitlab-ci.d/container-template.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-t= emplate.yml index f417452212..31e4e36a7d 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -13,7 +13,10 @@ script: - echo "TAG:$TAG" - echo "COMMON_TAG:$COMMON_TAG" - - docker build --tag $TAG -f "tests/docker/dockerfiles/$NAME.docker" "= ." + - docker pull "$TAG" || true + - docker build --tag "$TAG" --cache-from "$TAG" + --build-arg BUILDKIT_INLINE_CACHE=3D1 + -f "tests/docker/dockerfiles/$NAME.docker" "." - docker push "$TAG" after_script: - docker logout --=20 2.35.3 From nobody Tue May 14 11:41:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1677243294; cv=none; d=zohomail.com; s=zohoarc; b=T4OXXzVpXkhkrYaeisPje9w10CDoIughJSkzRQ4OWf9jZYcLctaN3x9z3x0eyfRA3HP73/19uD+grGxBvANbNnZtDqv18TTOriEkd462JsF5dWF+NFEUjWNjv9pYM2mps2J1VygTTQtjaaTik6h/F8wHPvRtu4WdG1idqQ73FWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677243294; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ElH4Mq23iJVdPlHGVDaYT00k2ser04rfkqGJntNiPz8=; b=Zonf0AXM1Cfc3iz01048ndg01oprGOEEg32u4f896XXixkbc8PkDZiGTVx2lExty9pJ9Sr5qwDuFfxDhNh2Pefq53xXuV4ECaRDrN4z9a4S8RztbFH4B5n3ZHVvbwkYJ0WwBixMBNLryiqbY8BdAw5YUBU3GTgEYjbQQamJVe/0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1677243294259290.97964360514754; Fri, 24 Feb 2023 04:54:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVXai-0007ig-Je; Fri, 24 Feb 2023 07:54:24 -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 1pVXag-0007i5-BV for qemu-devel@nongnu.org; Fri, 24 Feb 2023 07:54:22 -0500 Received: from smtp-out1.suse.de ([2001:67c:2178:6::1c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVXae-0004gP-R3 for qemu-devel@nongnu.org; Fri, 24 Feb 2023 07:54:22 -0500 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id BAD6838C57; Fri, 24 Feb 2023 12:54:19 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id BB5F313A3A; Fri, 24 Feb 2023 12:54:17 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id cF7AIHmz+GMHMwAAMHmgww (envelope-from ); Fri, 24 Feb 2023 12:54:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1677243259; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ElH4Mq23iJVdPlHGVDaYT00k2ser04rfkqGJntNiPz8=; b=JqKWBX2s1UrgsQ9HR6NcVdxUQC1VhqQQEOFRCvwSbmfpNZ3XIWux1ZRo1ley1o/x0dU54C Q3I70zZ4F8t3HFgtp9PSmXdNILiKVL/sPAU4btSONXC3XHQtmbTEr0x/fhBrBnEMbWXAyS NYqurIHu1Soxr5C/RBrDhzMmmRWw9zI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1677243259; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ElH4Mq23iJVdPlHGVDaYT00k2ser04rfkqGJntNiPz8=; b=Rl7RaatL0s4ljcitNralqxmtRHr8QS/fhtPE+pJuipmd1QDPhIsh2fuDbplR5rhmeVLpZM nfPZbkeih0FWR3Dw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [RFC PATCH v2 3/3] gitlab: Remove COMMON_TAG from container-template.yml Date: Fri, 24 Feb 2023 09:52:07 -0300 Message-Id: <20230224125207.19616-4-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230224125207.19616-1-farosas@suse.de> References: <20230224125207.19616-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:67c:2178:6::1c; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1677243296051100005 Content-Type: text/plain; charset="utf-8" We're not using the COMMON_TAG and we cannot have a push to a different registry than we pull from because that would get in the way of forks testing their changes to a dockerfile. Signed-off-by: Fabiano Rosas --- .gitlab-ci.d/container-template.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-t= emplate.yml index 31e4e36a7d..e7c1fa1522 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -6,13 +6,11 @@ - docker:dind before_script: - export TAG=3D"$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG=3D"$CI_REGISTRY/qemu-project/qemu/$NAME:latest" - apk add python3 - docker info - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PA= SSWORD" script: - echo "TAG:$TAG" - - echo "COMMON_TAG:$COMMON_TAG" - docker pull "$TAG" || true - docker build --tag "$TAG" --cache-from "$TAG" --build-arg BUILDKIT_INLINE_CACHE=3D1 --=20 2.35.3