s390x-rhcos-builder: Remove podman volume workaround

With podman version 4.5.0 it is now possible to skip volumes during prune with a specific label by adding --filter="label!=persistent". Remove the workaround used before to not prune secex-data volume, as it is no longer needed. Signed-off-by: Jan Schintag <[email protected]>
dustymabe · Jun 27, 2023 · 4f67dc6 · 4f67dc6
1 parent 26fb3c0
commit 4f67dc6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 27 deletions.
diff --git a/multi-arch-builders/builder-common.bu b/multi-arch-builders/builder-common.bu
@@ -87,7 +87,7 @@ storage:
           ExecStart=podman image prune --force
           ExecStart=podman image prune --all --force --filter until=48h
           ExecStart=podman container prune --force
-          ExecStart=podman volume prune --force
+          ExecStart=podman volume prune --force --filter="label!=persistent"
     - path: /home/builder/.config/systemd/user/prune-container-resources.timer
       mode: 0644
       user:

diff --git a/multi-arch-builders/coreos-s390x-rhcos-builder.bu b/multi-arch-builders/coreos-s390x-rhcos-builder.bu
@@ -29,12 +29,6 @@ systemd:
         [Install]
         WantedBy=multi-user.target
 storage:
-  directories:
-    - path: /home/builder/.config/systemd/user/default.target.wants
-      user:
-        name: builder
-      group:
-        name: builder
   files:
     - path: /usr/local/bin/create-secex-data.sh
       mode: 0755
@@ -96,23 +90,3 @@ storage:
 
             echo "Importing tarball into volume"
             sudo -u builder -H /bin/bash -c "cd /var/home/builder; podman volume import secex-data /var/home/builder/${TARBALL}"
-    - path: /home/builder/.config/systemd/user/secex-data-keepalive.service
-      mode: 0644
-      user:
-        name: builder
-      group:
-        name: builder
-      contents:
-        inline: |
-            [Unit]
-            Description=Run keepalive container for secex-data volume. See: https://github.com/containers/podman/issues/17051
-            [Service]
-            Type=oneshot
-            ExecStart=podman run -d --replace --name secex-data-keepalive -v secex-data:/data.secex:ro registry.fedoraproject.org/fedora:36 sleep infinity
-  links:
-    - path: /home/builder/.config/systemd/user/default.target.wants/secex-data-keepalive.service
-      target: /home/builder/.config/systemd/user/secex-data-keepalive.service
-      user:
-        name: builder
-      group:
-        name: builder