From nobody Thu May 2 01:39:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1616167189; cv=none; d=zohomail.com; s=zohoarc; b=RvVs+yHoPg7rXiZg7QCLNrXmTIyACrN26mLMIsR9Iol3nMgu2VWMtLBDpzLHMQZpRpxGwZ1+61tnoEHrZzrrxu76VsL7bPi0MlnYjgfY6f58AdaQ/FX5mJSt9I1x9NNIoXKxqUCRPdEIJjqD/PiG978H/cJ/5MX34ksCFCUwjmg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616167189; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=/v4OpCOWtOrvnnkr94nTWZ0vArQuFr0Z8II5Qabg5dk=; b=fo/2wydnHL6kJ715hKo8XGCICyUYkECCU4neGkUOw9cEkaTykqp5fodJNUr6RfWbcDeopd4ggTqhf3o8ITU3EUdYSzrMB0UjxpFa+13Nee172jiyFmJXWyRkEUeqePQhzi5qOZIUw91RvjG8QP4oBOPWAvHnjMb0h+LPt1TyMD8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616167188852264.8781063206551; Fri, 19 Mar 2021 08:19:48 -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-506-cdIUBkNzMyyO8tJeTx-zWA-1; Fri, 19 Mar 2021 11:19:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C86B68710F4; Fri, 19 Mar 2021 15:19:24 +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 769A960241; Fri, 19 Mar 2021 15:19:24 +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 D25C31809C83; Fri, 19 Mar 2021 15:19:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFJLwp000980 for ; Fri, 19 Mar 2021 11:19:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5A6751906D; Fri, 19 Mar 2021 15:19:21 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.194.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3279760C04 for ; Fri, 19 Mar 2021 15:19:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616167174; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/v4OpCOWtOrvnnkr94nTWZ0vArQuFr0Z8II5Qabg5dk=; b=ABIiDRbX/+I/OFcJQlp+5eahNHN2Z9VsWnSbUGf8YZi61YSn4GoyPlwJrDyebepOcWH4X+ 07HFSmy/J7kb/UWGGRvqx/G4U8Qi56W/hmqoafWSyNiJUtiMdrbO/kS8c1N6eeAB/cEA8e O8GoGU6BaHGriY9SN+ksX6ZRXM9JwhE= X-MC-Unique: cdIUBkNzMyyO8tJeTx-zWA-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] ci: Drop prefix from Dockerfiles Date: Fri, 19 Mar 2021 16:19:16 +0100 Message-Id: <20210319151916.316918-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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 the string "ci" is already contained in the path, it seems unnecessary to include it into the filename too: in fact, we only do that for Dockerfiles and not for files in ci/cirrus, even though those are generated the very same way. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- .gitlab-ci.yml | 2 +- ci/containers/{ci-centos-7.Dockerfile =3D> centos-7.Dockerfile} | 0 ci/containers/{ci-centos-8.Dockerfile =3D> centos-8.Dockerfile} | 0 .../{ci-centos-stream.Dockerfile =3D> centos-stream.Dockerfile} | 0 ...-aarch64.Dockerfile =3D> debian-10-cross-aarch64.Dockerfile} | 0 ...ss-armv6l.Dockerfile =3D> debian-10-cross-armv6l.Dockerfile} | 0 ...ss-armv7l.Dockerfile =3D> debian-10-cross-armv7l.Dockerfile} | 0 ...-cross-i686.Dockerfile =3D> debian-10-cross-i686.Dockerfile} | 0 ...-cross-mips.Dockerfile =3D> debian-10-cross-mips.Dockerfile} | 0 ...ips64el.Dockerfile =3D> debian-10-cross-mips64el.Dockerfile} | 0 ...ss-mipsel.Dockerfile =3D> debian-10-cross-mipsel.Dockerfile} | 0 ...-ppc64le.Dockerfile =3D> debian-10-cross-ppc64le.Dockerfile} | 0 ...ross-s390x.Dockerfile =3D> debian-10-cross-s390x.Dockerfile} | 0 .../{ci-debian-10.Dockerfile =3D> debian-10.Dockerfile} | 0 ...aarch64.Dockerfile =3D> debian-sid-cross-aarch64.Dockerfile} | 0 ...s-armv6l.Dockerfile =3D> debian-sid-cross-armv6l.Dockerfile} | 0 ...s-armv7l.Dockerfile =3D> debian-sid-cross-armv7l.Dockerfile} | 0 ...cross-i686.Dockerfile =3D> debian-sid-cross-i686.Dockerfile} | 0 ...ps64el.Dockerfile =3D> debian-sid-cross-mips64el.Dockerfile} | 0 ...s-mipsel.Dockerfile =3D> debian-sid-cross-mipsel.Dockerfile} | 0 ...ppc64le.Dockerfile =3D> debian-sid-cross-ppc64le.Dockerfile} | 0 ...oss-s390x.Dockerfile =3D> debian-sid-cross-s390x.Dockerfile} | 0 .../{ci-debian-sid.Dockerfile =3D> debian-sid.Dockerfile} | 0 .../{ci-fedora-32.Dockerfile =3D> fedora-32.Dockerfile} | 0 .../{ci-fedora-33.Dockerfile =3D> fedora-33.Dockerfile} | 0 ...w32.Dockerfile =3D> fedora-rawhide-cross-mingw32.Dockerfile} | 0 ...w64.Dockerfile =3D> fedora-rawhide-cross-mingw64.Dockerfile} | 0 ...ci-fedora-rawhide.Dockerfile =3D> fedora-rawhide.Dockerfile} | 0 .../{ci-opensuse-152.Dockerfile =3D> opensuse-152.Dockerfile} | 0 .../{ci-ubuntu-1804.Dockerfile =3D> ubuntu-1804.Dockerfile} | 0 .../{ci-ubuntu-2004.Dockerfile =3D> ubuntu-2004.Dockerfile} | 0 ci/helper | 4 ++-- 32 files changed, 3 insertions(+), 3 deletions(-) rename ci/containers/{ci-centos-7.Dockerfile =3D> centos-7.Dockerfile} (10= 0%) rename ci/containers/{ci-centos-8.Dockerfile =3D> centos-8.Dockerfile} (10= 0%) rename ci/containers/{ci-centos-stream.Dockerfile =3D> centos-stream.Docke= rfile} (100%) rename ci/containers/{ci-debian-10-cross-aarch64.Dockerfile =3D> debian-10= -cross-aarch64.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-armv6l.Dockerfile =3D> debian-10-= cross-armv6l.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-armv7l.Dockerfile =3D> debian-10-= cross-armv7l.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-i686.Dockerfile =3D> debian-10-cr= oss-i686.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-mips.Dockerfile =3D> debian-10-cr= oss-mips.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-mips64el.Dockerfile =3D> debian-1= 0-cross-mips64el.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-mipsel.Dockerfile =3D> debian-10-= cross-mipsel.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-ppc64le.Dockerfile =3D> debian-10= -cross-ppc64le.Dockerfile} (100%) rename ci/containers/{ci-debian-10-cross-s390x.Dockerfile =3D> debian-10-c= ross-s390x.Dockerfile} (100%) rename ci/containers/{ci-debian-10.Dockerfile =3D> debian-10.Dockerfile} (= 100%) rename ci/containers/{ci-debian-sid-cross-aarch64.Dockerfile =3D> debian-s= id-cross-aarch64.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-armv6l.Dockerfile =3D> debian-si= d-cross-armv6l.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-armv7l.Dockerfile =3D> debian-si= d-cross-armv7l.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-i686.Dockerfile =3D> debian-sid-= cross-i686.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-mips64el.Dockerfile =3D> debian-= sid-cross-mips64el.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-mipsel.Dockerfile =3D> debian-si= d-cross-mipsel.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-ppc64le.Dockerfile =3D> debian-s= id-cross-ppc64le.Dockerfile} (100%) rename ci/containers/{ci-debian-sid-cross-s390x.Dockerfile =3D> debian-sid= -cross-s390x.Dockerfile} (100%) rename ci/containers/{ci-debian-sid.Dockerfile =3D> debian-sid.Dockerfile}= (100%) rename ci/containers/{ci-fedora-32.Dockerfile =3D> fedora-32.Dockerfile} (= 100%) rename ci/containers/{ci-fedora-33.Dockerfile =3D> fedora-33.Dockerfile} (= 100%) rename ci/containers/{ci-fedora-rawhide-cross-mingw32.Dockerfile =3D> fedo= ra-rawhide-cross-mingw32.Dockerfile} (100%) rename ci/containers/{ci-fedora-rawhide-cross-mingw64.Dockerfile =3D> fedo= ra-rawhide-cross-mingw64.Dockerfile} (100%) rename ci/containers/{ci-fedora-rawhide.Dockerfile =3D> fedora-rawhide.Doc= kerfile} (100%) rename ci/containers/{ci-opensuse-152.Dockerfile =3D> opensuse-152.Dockerf= ile} (100%) rename ci/containers/{ci-ubuntu-1804.Dockerfile =3D> ubuntu-1804.Dockerfil= e} (100%) rename ci/containers/{ci-ubuntu-2004.Dockerfile =3D> ubuntu-2004.Dockerfil= e} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81a4e80fd8..a059ad229c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ stages: - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGI= STRY_PASSWORD" script: - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$= TAG" -f "ci/containers/ci-$NAME.Dockerfile" ci/containers + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$= TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers - docker push "$TAG" after_script: - docker logout diff --git a/ci/containers/ci-centos-7.Dockerfile b/ci/containers/centos-7.= Dockerfile similarity index 100% rename from ci/containers/ci-centos-7.Dockerfile rename to ci/containers/centos-7.Dockerfile diff --git a/ci/containers/ci-centos-8.Dockerfile b/ci/containers/centos-8.= Dockerfile similarity index 100% rename from ci/containers/ci-centos-8.Dockerfile rename to ci/containers/centos-8.Dockerfile diff --git a/ci/containers/ci-centos-stream.Dockerfile b/ci/containers/cent= os-stream.Dockerfile similarity index 100% rename from ci/containers/ci-centos-stream.Dockerfile rename to ci/containers/centos-stream.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile b/ci/conta= iners/debian-10-cross-aarch64.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-aarch64.Dockerfile rename to ci/containers/debian-10-cross-aarch64.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-armv6l.Dockerfile b/ci/contai= ners/debian-10-cross-armv6l.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-armv6l.Dockerfile rename to ci/containers/debian-10-cross-armv6l.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-armv7l.Dockerfile b/ci/contai= ners/debian-10-cross-armv7l.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-armv7l.Dockerfile rename to ci/containers/debian-10-cross-armv7l.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-i686.Dockerfile b/ci/containe= rs/debian-10-cross-i686.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-i686.Dockerfile rename to ci/containers/debian-10-cross-i686.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-mips.Dockerfile b/ci/containe= rs/debian-10-cross-mips.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-mips.Dockerfile rename to ci/containers/debian-10-cross-mips.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-mips64el.Dockerfile b/ci/cont= ainers/debian-10-cross-mips64el.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-mips64el.Dockerfile rename to ci/containers/debian-10-cross-mips64el.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-mipsel.Dockerfile b/ci/contai= ners/debian-10-cross-mipsel.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-mipsel.Dockerfile rename to ci/containers/debian-10-cross-mipsel.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile b/ci/conta= iners/debian-10-cross-ppc64le.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-ppc64le.Dockerfile rename to ci/containers/debian-10-cross-ppc64le.Dockerfile diff --git a/ci/containers/ci-debian-10-cross-s390x.Dockerfile b/ci/contain= ers/debian-10-cross-s390x.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10-cross-s390x.Dockerfile rename to ci/containers/debian-10-cross-s390x.Dockerfile diff --git a/ci/containers/ci-debian-10.Dockerfile b/ci/containers/debian-1= 0.Dockerfile similarity index 100% rename from ci/containers/ci-debian-10.Dockerfile rename to ci/containers/debian-10.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile b/ci/cont= ainers/debian-sid-cross-aarch64.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-aarch64.Dockerfile rename to ci/containers/debian-sid-cross-aarch64.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile b/ci/conta= iners/debian-sid-cross-armv6l.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-armv6l.Dockerfile rename to ci/containers/debian-sid-cross-armv6l.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile b/ci/conta= iners/debian-sid-cross-armv7l.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-armv7l.Dockerfile rename to ci/containers/debian-sid-cross-armv7l.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-i686.Dockerfile b/ci/contain= ers/debian-sid-cross-i686.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-i686.Dockerfile rename to ci/containers/debian-sid-cross-i686.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile b/ci/con= tainers/debian-sid-cross-mips64el.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-mips64el.Dockerfile rename to ci/containers/debian-sid-cross-mips64el.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile b/ci/conta= iners/debian-sid-cross-mipsel.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-mipsel.Dockerfile rename to ci/containers/debian-sid-cross-mipsel.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile b/ci/cont= ainers/debian-sid-cross-ppc64le.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile rename to ci/containers/debian-sid-cross-ppc64le.Dockerfile diff --git a/ci/containers/ci-debian-sid-cross-s390x.Dockerfile b/ci/contai= ners/debian-sid-cross-s390x.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid-cross-s390x.Dockerfile rename to ci/containers/debian-sid-cross-s390x.Dockerfile diff --git a/ci/containers/ci-debian-sid.Dockerfile b/ci/containers/debian-= sid.Dockerfile similarity index 100% rename from ci/containers/ci-debian-sid.Dockerfile rename to ci/containers/debian-sid.Dockerfile diff --git a/ci/containers/ci-fedora-32.Dockerfile b/ci/containers/fedora-3= 2.Dockerfile similarity index 100% rename from ci/containers/ci-fedora-32.Dockerfile rename to ci/containers/fedora-32.Dockerfile diff --git a/ci/containers/ci-fedora-33.Dockerfile b/ci/containers/fedora-3= 3.Dockerfile similarity index 100% rename from ci/containers/ci-fedora-33.Dockerfile rename to ci/containers/fedora-33.Dockerfile diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile b/ci/= containers/fedora-rawhide-cross-mingw32.Dockerfile similarity index 100% rename from ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile rename to ci/containers/fedora-rawhide-cross-mingw32.Dockerfile diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile b/ci/= containers/fedora-rawhide-cross-mingw64.Dockerfile similarity index 100% rename from ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile rename to ci/containers/fedora-rawhide-cross-mingw64.Dockerfile diff --git a/ci/containers/ci-fedora-rawhide.Dockerfile b/ci/containers/fed= ora-rawhide.Dockerfile similarity index 100% rename from ci/containers/ci-fedora-rawhide.Dockerfile rename to ci/containers/fedora-rawhide.Dockerfile diff --git a/ci/containers/ci-opensuse-152.Dockerfile b/ci/containers/opens= use-152.Dockerfile similarity index 100% rename from ci/containers/ci-opensuse-152.Dockerfile rename to ci/containers/opensuse-152.Dockerfile diff --git a/ci/containers/ci-ubuntu-1804.Dockerfile b/ci/containers/ubuntu= -1804.Dockerfile similarity index 100% rename from ci/containers/ci-ubuntu-1804.Dockerfile rename to ci/containers/ubuntu-1804.Dockerfile diff --git a/ci/containers/ci-ubuntu-2004.Dockerfile b/ci/containers/ubuntu= -2004.Dockerfile similarity index 100% rename from ci/containers/ci-ubuntu-2004.Dockerfile rename to ci/containers/ubuntu-2004.Dockerfile diff --git a/ci/helper b/ci/helper index 7032c816d5..2c3a9f8db4 100755 --- a/ci/helper +++ b/ci/helper @@ -197,11 +197,11 @@ class Application: def _generate_dockerfile(self, host, cross=3DNone): args =3D ["dockerfile", host, "libvirt"] outdir =3D self._basedir.joinpath("containers") - outfile =3D f"ci-{host}.Dockerfile" + outfile =3D f"{host}.Dockerfile" =20 if cross: args.extend(["--cross", cross]) - outfile =3D f"ci-{host}-cross-{cross}.Dockerfile" + outfile =3D f"{host}-cross-{cross}.Dockerfile" =20 outpath =3D outdir.joinpath(outfile) if not self._args.quiet: --=20 2.26.3