ci: Drop prefix from Dockerfiles

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 <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81a4e80fd8ea7a8f41423444135e504ebc2196bd..a059ad229c514f1708a60b35091f81e18dc4b1ad 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ stages:
     - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_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/centos-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/containers/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/containers/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/containers/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/containers/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/containers/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/containers/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/containers/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/containers/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/containers/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-10.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/containers/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/containers/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/containers/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/containers/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/containers/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/containers/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/containers/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/containers/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-32.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-33.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/fedora-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/opensuse-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 7032c816d5a0359c4686bb451696930c412434dc..2c3a9f8db487c72a6b9f1e3c69502a183ac337da 100755 (executable)
--- a/ci/helper
+++ b/ci/helper
@@ -197,11 +197,11 @@ class Application:
     def _generate_dockerfile(self, host, cross=None):
         args = ["dockerfile", host, "libvirt"]
         outdir = self._basedir.joinpath("containers")
-        outfile = f"ci-{host}.Dockerfile"
+        outfile = f"{host}.Dockerfile"
 
         if cross:
             args.extend(["--cross", cross])
-            outfile = f"ci-{host}-cross-{cross}.Dockerfile"
+            outfile = f"{host}-cross-{cross}.Dockerfile"
 
         outpath = outdir.joinpath(outfile)
         if not self._args.quiet: