[PATCH 1/2] ci: Regenerate dockerfiles after 'sheepdog' removal

Peter Krempa pkrempa at redhat.com
Thu Sep 1 11:58:23 UTC 2022


After support for the sheepdog storage driver backend was removed we
don't need to install it any longer in the containers.

Regenerate the dockerfiles after:
https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/314
---

Sign-off will be added once the merge request above is accepted.

 ci/containers/fedora-35.Dockerfile                    | 1 -
 ci/containers/fedora-36-cross-mingw32.Dockerfile      | 3 +--
 ci/containers/fedora-36-cross-mingw64.Dockerfile      | 3 +--
 ci/containers/fedora-36.Dockerfile                    | 1 -
 ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 3 +--
 ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 3 +--
 ci/containers/fedora-rawhide.Dockerfile               | 1 -
 7 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/ci/containers/fedora-35.Dockerfile b/ci/containers/fedora-35.Dockerfile
index 117b2736c3..5ff5abf242 100644
--- a/ci/containers/fedora-35.Dockerfile
+++ b/ci/containers/fedora-35.Dockerfile
@@ -88,7 +88,6 @@ exec "$@"' > /usr/bin/nosync && \
         sanlock-devel \
         scrub \
         sed \
-        sheepdog \
         systemd-devel \
         systemtap-sdt-devel \
         wireshark-devel \
diff --git a/ci/containers/fedora-36-cross-mingw32.Dockerfile b/ci/containers/fedora-36-cross-mingw32.Dockerfile
index 76659d696a..4a222c05a6 100644
--- a/ci/containers/fedora-36-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-36-cross-mingw32.Dockerfile
@@ -54,8 +54,7 @@ exec "$@"' > /usr/bin/nosync && \
         rpcgen \
         rpm-build \
         scrub \
-        sed \
-        sheepdog && \
+        sed && \
     nosync dnf autoremove -y && \
     nosync dnf clean all -y

diff --git a/ci/containers/fedora-36-cross-mingw64.Dockerfile b/ci/containers/fedora-36-cross-mingw64.Dockerfile
index 0bccf0738c..aaf26308e1 100644
--- a/ci/containers/fedora-36-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-36-cross-mingw64.Dockerfile
@@ -54,8 +54,7 @@ exec "$@"' > /usr/bin/nosync && \
         rpcgen \
         rpm-build \
         scrub \
-        sed \
-        sheepdog && \
+        sed && \
     nosync dnf autoremove -y && \
     nosync dnf clean all -y

diff --git a/ci/containers/fedora-36.Dockerfile b/ci/containers/fedora-36.Dockerfile
index f99ba502c5..562f403ac7 100644
--- a/ci/containers/fedora-36.Dockerfile
+++ b/ci/containers/fedora-36.Dockerfile
@@ -87,7 +87,6 @@ exec "$@"' > /usr/bin/nosync && \
         sanlock-devel \
         scrub \
         sed \
-        sheepdog \
         systemd-devel \
         systemtap-sdt-devel \
         wireshark-devel \
diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
index 5c4a124e33..4ff983dbd0 100644
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@@ -55,8 +55,7 @@ exec "$@"' > /usr/bin/nosync && \
         rpcgen \
         rpm-build \
         scrub \
-        sed \
-        sheepdog && \
+        sed && \
     nosync dnf autoremove -y && \
     nosync dnf clean all -y

diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
index 7e626a8230..87bc98d29c 100644
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@@ -55,8 +55,7 @@ exec "$@"' > /usr/bin/nosync && \
         rpcgen \
         rpm-build \
         scrub \
-        sed \
-        sheepdog && \
+        sed && \
     nosync dnf autoremove -y && \
     nosync dnf clean all -y

diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile
index beca9062f5..a4d75c25a6 100644
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -88,7 +88,6 @@ exec "$@"' > /usr/bin/nosync && \
         sanlock-devel \
         scrub \
         sed \
-        sheepdog \
         systemd-devel \
         systemtap-sdt-devel \
         wireshark-devel \
-- 
2.37.1



More information about the libvir-list mailing list