From fdfb14225bddc282fb182e57c08c51fcaa72b31e Mon Sep 17 00:00:00 2001
From: Jakub Kadlcik <frostyx@email.cz>
Date: Thu, 22 May 2025 18:15:24 +0200
Subject: [PATCH] copr-be-dev: bootc images for everything except for AWS

---
 inventory/group_vars/copr_dev_aws                  | 11 ++++-------
 roles/copr/backend/templates/provision/libvirt-new |  8 +-------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws
index a30b17148b..ff32acff89 100644
--- a/inventory/group_vars/copr_dev_aws
+++ b/inventory/group_vars/copr_dev_aws
@@ -153,10 +153,8 @@ copr_builder_images:
   hypervisor:
     # n-1: ppc64le: copr-builder-ppc64le-20240201_144151
     # n-1: x86_64: copr-builder-x86_64-20240201_144216
-    # ppc64le: copr-builder-ppc64le-20241119_171239  # Production
-    ppc64le: copr-builder-ppc64le-20250518_175056  # Bootc experiment
-    # x86_64: copr-builder-x86_64-20241119_172236  # Production
-    x86_64: copr-builder-x86_64-20250515_154219  # Bootc experiment
+    ppc64le: copr-builder-ppc64le-20250522_150820
+    x86_64: copr-builder-x86_64-20250522_150535
   ibm_cloud:
     br_sao:  # São Paulo
       s390x: r042-5e105a96-4a84-4c07-950b-9fd12d58c8a2
@@ -164,11 +162,10 @@ copr_builder_images:
       s390x: r050-053cfdb8-52eb-486d-b8b3-bc9cba2fbe56
     us_east:  # Washington
       # n-1: us_east: r014-1469fafc-d906-44fa-b780-e4599ed56fde
-      s390x: r014-9ba4feec-ce45-4401-acea-f123114685b5
+      s390x: r014-e21e3656-9ef9-497b-8ab7-149fa1e69f2d
   osuosl:
     # ppc64le: copr-builder-ppc64le-20240206_143009
-    # ppc64le: copr-builder-ppc64le-20241119_171239  # Production
-    ppc64le: copr-builder-ppc64le-20250518_175056  # Bootc experiment
+    ppc64le: copr-builder-ppc64le-20250522_150820
 
 copr_messaging: true
 datacenter: aws
diff --git a/roles/copr/backend/templates/provision/libvirt-new b/roles/copr/backend/templates/provision/libvirt-new
index 1f51bda05c..9ad6885e08 100755
--- a/roles/copr/backend/templates/provision/libvirt-new
+++ b/roles/copr/backend/templates/provision/libvirt-new
@@ -40,7 +40,7 @@ class LibvirtSpawner:
     workdir = None
     connection = None
     root_disk_pool = "images"
-    root_vol_size = "6GB"
+    root_vol_size = "11GB"
     startup_script = ""
     config_files = []
     arch = None
@@ -63,12 +63,6 @@ class LibvirtSpawner:
         self.log.debug("Logging to %s", self.connection)
         self.cleanup_actions = {}
 
-        # This is not needed by our standard x86_64, only experimental bootc
-        # builders. Eventually, we should either make them smaller or use this
-        # larger volume size for all architectures.
-        if self.arch == "x86_64":
-            self.root_vol_size = "11GB"
-
     def call(self, cmd, *args, **kwargs):
         """
         Run CMD, and log info.