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>

.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

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: