From nobody Sun Feb 8 17:37:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1590757286; cv=none; d=zohomail.com; s=zohoarc; b=hnnwbs4Du/hWqRBjC7jgmf129HSJtBR+BX5YXhzk2wk+zqkYxOFxYYrX8i3Od3CUpa8j/MoMLI8Aqi5HnF6mBelpbA0fiLfYBszc7FDI0xLshhmV6x+sX9Ae7pdDxmzrubWCMChihkzcCf1DOyMt6ZEJjteFNrGHHkyba7QtcnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590757286; h=Content-Type:Content-Transfer-Encoding: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=UpAD0kl6KFKaSUURUa+n4On2XPvWv7ehfmT+JeQJsbU=; b=asfAebeR5smx5JrRFienWZzfBegn+JqsqGjTe1RMW0pZSlwIegjreKbRjJ82haldrf9GDtXAQ+oHDHKcY+TII/m9W7NG+GqZylgbPPCutgTnqi+wx5VZIre95gTej8FtjzX6M0YOnzCjKdePP4HvNTXZ3BvZcrvMTNKpr2/Fr0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1590757286600461.51035042461956; Fri, 29 May 2020 06:01:26 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-294-fSLN9PAEMOGt2XhENlfxoQ-1; Fri, 29 May 2020 09:01:21 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D43F461; Fri, 29 May 2020 13:01:10 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2767677CA2; Fri, 29 May 2020 13:01:10 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E9B941809541; Fri, 29 May 2020 13:01:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04TD0tsg011359 for ; Fri, 29 May 2020 09:00:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0FEDC99DE6; Fri, 29 May 2020 13:00:55 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.40.194.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D90EA1035 for ; Fri, 29 May 2020 13:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590757284; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UpAD0kl6KFKaSUURUa+n4On2XPvWv7ehfmT+JeQJsbU=; b=iiqQI7/1p3jYwnfTsJnWWpwqOcuB9Bkdbe7u4cBrmx2a1Cutk+0jsicxXsICRAKsDcBTlc GRFeU0HiSqFD8YdLMNMqkwzXA62AL1jqvlegF+JzAweQiecM+xx1j9jzQjEIjduYEDxNEI QPk8r1qxF5r5LHckTVgC7ez7SyHJi8U= X-MC-Unique: fSLN9PAEMOGt2XhENlfxoQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 5/5] ci: Improve CI_IMAGE_TAG handling Date: Fri, 29 May 2020 15:00:44 +0200 Message-Id: <20200529130044.466874-6-abologna@redhat.com> In-Reply-To: <20200529130044.466874-1-abologna@redhat.com> References: <20200529130044.466874-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Since we're already building the full container image reference dynamically at this point, we can finally get rid of the annoying requirement to include ":" in CI_IMAGE_TAG. Signed-off-by: Andrea Bolognani --- ci/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/Makefile b/ci/Makefile index e1a5faaba6..96e4d62611 100644 --- a/ci/Makefile +++ b/ci/Makefile @@ -55,9 +55,9 @@ CI_IMAGE_REGISTRY =3D registry.gitlab.com # image instead CI_IMAGE_PREFIX =3D libvirt/libvirt/ci- =20 -# The default tag is ':latest' but if the container +# The default tag is 'latest' but if the container # repo above uses different conventions this can override it -CI_IMAGE_TAG =3D :latest +CI_IMAGE_TAG =3D latest =20 # We delete the virtual root after completion, set # to 0 if you need to keep it around for debugging @@ -220,7 +220,10 @@ ci-run-command@%: ci-prepare-tree if test "$(CI_IMAGE_REGISTRY)"; then \ image=3D"$${image}$(CI_IMAGE_REGISTRY)/"; \ fi; \ - image=3D"$${image}$(CI_IMAGE_PREFIX)$*$(CI_IMAGE_TAG)"; \ + image=3D"$${image}$(CI_IMAGE_PREFIX)$*"; \ + if test "$(CI_IMAGE_TAG)"; then \ + image=3D"$${image}:$(CI_IMAGE_TAG)"; \ + fi; \ $(CI_ENGINE) run $(CI_ENGINE_ARGS) "$$image" \ /bin/bash -c ' \ $(CI_USER_HOME)/prepare || exit 1; \ --=20 2.25.4