This makes the dockerfile name match the output container name

Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
---
 .gitlab-ci.yml                                     |  2 +-
 ...-centos-7.Dockerfile => ci-centos-7.Dockerfile} |  0
 ...-centos-8.Dockerfile => ci-centos-8.Dockerfile} |  0
 ...ream.Dockerfile => ci-centos-stream.Dockerfile} |  0
 ...rfile => ci-debian-10-cross-aarch64.Dockerfile} |  0
 ...erfile => ci-debian-10-cross-armv6l.Dockerfile} |  0
 ...erfile => ci-debian-10-cross-armv7l.Dockerfile} |  0
 ...ckerfile => ci-debian-10-cross-i686.Dockerfile} |  0
 ...ckerfile => ci-debian-10-cross-mips.Dockerfile} |  0
 ...file => ci-debian-10-cross-mips64el.Dockerfile} |  0
 ...erfile => ci-debian-10-cross-mipsel.Dockerfile} |  0
 ...rfile => ci-debian-10-cross-ppc64le.Dockerfile} |  0
 ...kerfile => ci-debian-10-cross-s390x.Dockerfile} |  0
 ...ebian-10.Dockerfile => ci-debian-10.Dockerfile} |  0
 ...file => ci-debian-sid-cross-aarch64.Dockerfile} |  0
 ...rfile => ci-debian-sid-cross-armv6l.Dockerfile} |  0
 ...rfile => ci-debian-sid-cross-armv7l.Dockerfile} |  0
 ...kerfile => ci-debian-sid-cross-i686.Dockerfile} |  0
 ...ile => ci-debian-sid-cross-mips64el.Dockerfile} |  0
 ...rfile => ci-debian-sid-cross-mipsel.Dockerfile} |  0
 ...file => ci-debian-sid-cross-ppc64le.Dockerfile} |  0
 ...erfile => ci-debian-sid-cross-s390x.Dockerfile} |  0
 ...ian-sid.Dockerfile => ci-debian-sid.Dockerfile} |  0
 ...edora-32.Dockerfile => ci-fedora-32.Dockerfile} |  0
 ...edora-33.Dockerfile => ci-fedora-33.Dockerfile} |  0
 ... => ci-fedora-rawhide-cross-mingw32.Dockerfile} |  0
 ... => ci-fedora-rawhide-cross-mingw64.Dockerfile} |  0
 ...ide.Dockerfile => ci-fedora-rawhide.Dockerfile} |  0
 ...e-151.Dockerfile => ci-opensuse-151.Dockerfile} |  0
 ...u-1804.Dockerfile => ci-ubuntu-1804.Dockerfile} |  0
 ...u-2004.Dockerfile => ci-ubuntu-2004.Dockerfile} |  0
 ci/containers/refresh                              | 14 +++++++-------
 32 files changed, 8 insertions(+), 8 deletions(-)
 rename ci/containers/{libvirt-centos-7.Dockerfile => ci-centos-7.Dockerfile} 
(100%)
 rename ci/containers/{libvirt-centos-8.Dockerfile => ci-centos-8.Dockerfile} 
(100%)
 rename ci/containers/{libvirt-centos-stream.Dockerfile => 
ci-centos-stream.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-10-cross-aarch64.Dockerfile => 
ci-debian-10-cross-aarch64.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-10-cross-armv6l.Dockerfile => 
ci-debian-10-cross-armv6l.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-10-cross-armv7l.Dockerfile => 
ci-debian-10-cross-armv7l.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-10-cross-i686.Dockerfile => 
ci-debian-10-cross-i686.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-10-cross-mips.Dockerfile => 
ci-debian-10-cross-mips.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-10-cross-mips64el.Dockerfile => 
ci-debian-10-cross-mips64el.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-10-cross-mipsel.Dockerfile => 
ci-debian-10-cross-mipsel.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-10-cross-ppc64le.Dockerfile => 
ci-debian-10-cross-ppc64le.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-10-cross-s390x.Dockerfile => 
ci-debian-10-cross-s390x.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-10.Dockerfile => ci-debian-10.Dockerfile} 
(100%)
 rename ci/containers/{libvirt-debian-sid-cross-aarch64.Dockerfile => 
ci-debian-sid-cross-aarch64.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-sid-cross-armv6l.Dockerfile => 
ci-debian-sid-cross-armv6l.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-sid-cross-armv7l.Dockerfile => 
ci-debian-sid-cross-armv7l.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-sid-cross-i686.Dockerfile => 
ci-debian-sid-cross-i686.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-sid-cross-mips64el.Dockerfile => 
ci-debian-sid-cross-mips64el.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-sid-cross-mipsel.Dockerfile => 
ci-debian-sid-cross-mipsel.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-sid-cross-ppc64le.Dockerfile => 
ci-debian-sid-cross-ppc64le.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-sid-cross-s390x.Dockerfile => 
ci-debian-sid-cross-s390x.Dockerfile} (100%)
 rename ci/containers/{libvirt-debian-sid.Dockerfile => 
ci-debian-sid.Dockerfile} (100%)
 rename ci/containers/{libvirt-fedora-32.Dockerfile => ci-fedora-32.Dockerfile} 
(100%)
 rename ci/containers/{libvirt-fedora-33.Dockerfile => ci-fedora-33.Dockerfile} 
(100%)
 rename ci/containers/{libvirt-fedora-rawhide-cross-mingw32.Dockerfile => 
ci-fedora-rawhide-cross-mingw32.Dockerfile} (100%)
 rename ci/containers/{libvirt-fedora-rawhide-cross-mingw64.Dockerfile => 
ci-fedora-rawhide-cross-mingw64.Dockerfile} (100%)
 rename ci/containers/{libvirt-fedora-rawhide.Dockerfile => 
ci-fedora-rawhide.Dockerfile} (100%)
 rename ci/containers/{libvirt-opensuse-151.Dockerfile => 
ci-opensuse-151.Dockerfile} (100%)
 rename ci/containers/{libvirt-ubuntu-1804.Dockerfile => 
ci-ubuntu-1804.Dockerfile} (100%)
 rename ci/containers/{libvirt-ubuntu-2004.Dockerfile => 
ci-ubuntu-2004.Dockerfile} (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4f6aa8ee9..e2d5545f0f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,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/libvirt-$NAME.Dockerfile" ci/containers
+    - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" 
-f "ci/containers/ci-$NAME.Dockerfile" ci/containers
     - docker push "$TAG"
   after_script:
     - docker logout
diff --git a/ci/containers/libvirt-centos-7.Dockerfile 
b/ci/containers/ci-centos-7.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-centos-7.Dockerfile
rename to ci/containers/ci-centos-7.Dockerfile
diff --git a/ci/containers/libvirt-centos-8.Dockerfile 
b/ci/containers/ci-centos-8.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-centos-8.Dockerfile
rename to ci/containers/ci-centos-8.Dockerfile
diff --git a/ci/containers/libvirt-centos-stream.Dockerfile 
b/ci/containers/ci-centos-stream.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-centos-stream.Dockerfile
rename to ci/containers/ci-centos-stream.Dockerfile
diff --git a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile 
b/ci/containers/ci-debian-10-cross-aarch64.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
rename to ci/containers/ci-debian-10-cross-aarch64.Dockerfile
diff --git a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile 
b/ci/containers/ci-debian-10-cross-armv6l.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
rename to ci/containers/ci-debian-10-cross-armv6l.Dockerfile
diff --git a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile 
b/ci/containers/ci-debian-10-cross-armv7l.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
rename to ci/containers/ci-debian-10-cross-armv7l.Dockerfile
diff --git a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile 
b/ci/containers/ci-debian-10-cross-i686.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-10-cross-i686.Dockerfile
rename to ci/containers/ci-debian-10-cross-i686.Dockerfile
diff --git a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile 
b/ci/containers/ci-debian-10-cross-mips.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-10-cross-mips.Dockerfile
rename to ci/containers/ci-debian-10-cross-mips.Dockerfile
diff --git a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile 
b/ci/containers/ci-debian-10-cross-mips64el.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
rename to ci/containers/ci-debian-10-cross-mips64el.Dockerfile
diff --git a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile 
b/ci/containers/ci-debian-10-cross-mipsel.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
rename to ci/containers/ci-debian-10-cross-mipsel.Dockerfile
diff --git a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile 
b/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
rename to ci/containers/ci-debian-10-cross-ppc64le.Dockerfile
diff --git a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile 
b/ci/containers/ci-debian-10-cross-s390x.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
rename to ci/containers/ci-debian-10-cross-s390x.Dockerfile
diff --git a/ci/containers/libvirt-debian-10.Dockerfile 
b/ci/containers/ci-debian-10.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-10.Dockerfile
rename to ci/containers/ci-debian-10.Dockerfile
diff --git a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile 
b/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
rename to ci/containers/ci-debian-sid-cross-aarch64.Dockerfile
diff --git a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile 
b/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
rename to ci/containers/ci-debian-sid-cross-armv6l.Dockerfile
diff --git a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile 
b/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
rename to ci/containers/ci-debian-sid-cross-armv7l.Dockerfile
diff --git a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile 
b/ci/containers/ci-debian-sid-cross-i686.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
rename to ci/containers/ci-debian-sid-cross-i686.Dockerfile
diff --git a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile 
b/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
rename to ci/containers/ci-debian-sid-cross-mips64el.Dockerfile
diff --git a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile 
b/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
rename to ci/containers/ci-debian-sid-cross-mipsel.Dockerfile
diff --git a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile 
b/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
rename to ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile
diff --git a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile 
b/ci/containers/ci-debian-sid-cross-s390x.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
rename to ci/containers/ci-debian-sid-cross-s390x.Dockerfile
diff --git a/ci/containers/libvirt-debian-sid.Dockerfile 
b/ci/containers/ci-debian-sid.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-debian-sid.Dockerfile
rename to ci/containers/ci-debian-sid.Dockerfile
diff --git a/ci/containers/libvirt-fedora-32.Dockerfile 
b/ci/containers/ci-fedora-32.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-fedora-32.Dockerfile
rename to ci/containers/ci-fedora-32.Dockerfile
diff --git a/ci/containers/libvirt-fedora-33.Dockerfile 
b/ci/containers/ci-fedora-33.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-fedora-33.Dockerfile
rename to ci/containers/ci-fedora-33.Dockerfile
diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile 
b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
rename to ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile
diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile 
b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
rename to ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile
diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile 
b/ci/containers/ci-fedora-rawhide.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-fedora-rawhide.Dockerfile
rename to ci/containers/ci-fedora-rawhide.Dockerfile
diff --git a/ci/containers/libvirt-opensuse-151.Dockerfile 
b/ci/containers/ci-opensuse-151.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-opensuse-151.Dockerfile
rename to ci/containers/ci-opensuse-151.Dockerfile
diff --git a/ci/containers/libvirt-ubuntu-1804.Dockerfile 
b/ci/containers/ci-ubuntu-1804.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-ubuntu-1804.Dockerfile
rename to ci/containers/ci-ubuntu-1804.Dockerfile
diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile 
b/ci/containers/ci-ubuntu-2004.Dockerfile
similarity index 100%
rename from ci/containers/libvirt-ubuntu-2004.Dockerfile
rename to ci/containers/ci-ubuntu-2004.Dockerfile
diff --git a/ci/containers/refresh b/ci/containers/refresh
index 4cae30b869..a39d0b0996 100755
--- a/ci/containers/refresh
+++ b/ci/containers/refresh
@@ -19,24 +19,24 @@ HOSTS=$($LCITOOL hosts | grep -Ev 'freebsd|macos')
 for host in $HOSTS
 do
     case "$host" in
-    libvirt-fedora-rawhide)
+    fedora-rawhide)
         for cross in mingw32 mingw64
         do
-            $LCITOOL dockerfile $host libvirt --cross $cross 
>$host-cross-$cross.Dockerfile
+            $LCITOOL dockerfile $host libvirt --cross $cross > 
ci-$host-cross-$cross.Dockerfile
         done
         ;;
-    libvirt-debian-*)
+    debian-*)
         for cross in aarch64 armv6l armv7l i686 mips mips64el mipsel ppc64le 
s390x
         do
-            if test "$host-cross-$cross" = "libvirt-debian-9-cross-i686" ||
-               test "$host-cross-$cross" = "libvirt-debian-sid-cross-mips"
+            if test "$host-cross-$cross" = "debian-9-cross-i686" ||
+               test "$host-cross-$cross" = "debian-sid-cross-mips"
             then
                 continue
             fi
-            $LCITOOL dockerfile $host libvirt --cross $cross 
>$host-cross-$cross.Dockerfile
+            $LCITOOL dockerfile $host libvirt --cross $cross > 
ci-$host-cross-$cross.Dockerfile
         done
         ;;
     esac
 
-    $LCITOOL dockerfile $host libvirt >$host.Dockerfile
+    $LCITOOL dockerfile $host libvirt > ci-$host.Dockerfile
 done
-- 
2.28.0

Reply via email to