launchpad-reviewers team mailing list archive

[İlker Emre Koç <mp+478732@xxxxxxxxxxxxxxxxxx>]

İlker Emre Koç has proposed merging ~ilkeremrekoc/launchpad-mojo-specs/+git/private:bugfix-rebuild-images into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
bugfix rebuild-images

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ilkeremrekoc/launchpad-mojo-specs/+git/private/+merge/478732

The naming scheme the rebuild-images script uses to reach the aforementioned images is wrong. Thus I changed the naming scheme used within the script.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ilkeremrekoc/launchpad-mojo-specs/+git/private:bugfix-rebuild-images into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index cf9f734..894b656 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -13,33 +13,33 @@ name_prefix_by_stage = {
 
 targets_by_stage = {
     "qastaging": [
-        ("bos03", "amd64", "noble"),
-        ("bos03", "amd64-gpu", "focal"),
-        ("bos03", "arm64", "noble"),
-        ("bos03", "arm64-gpu", "focal"),
-        ("bos03", "ppc64el", "focal"),
-        ("bos03", "riscv64", "noble"),
-        ("bos03", "s390x", "focal"),
-        ("lcy02", "amd64", "noble"),
+        ("bos03", "amd64", "", "noble"),
+        ("bos03", "amd64", "-gpu", "focal"),
+        ("bos03", "arm64", "", "noble"),
+        ("bos03", "arm64", "-gpu", "focal"),
+        ("bos03", "ppc64el", "", "focal"),
+        ("bos03", "riscv64", "", "noble"),
+        ("bos03", "s390x", "", "focal"),
+        ("lcy02", "amd64", "", "noble"),
         ],
     "staging": [
-        ("bos01", "arm64-gpu", "jammy"),
-        ("bos01", "ppc64el", "jammy"),
-        ("bos01", "s390x", "jammy"),
-        ("bos02", "ppc64el", "jammy"),
-        ("bos02", "s390x", "jammy"),
-        ("bos03", "amd64", "jammy"),
-        ("lcy02", "amd64", "jammy"),
+        ("bos01", "arm64", "-gpu", "jammy"),
+        ("bos01", "ppc64el", "", "jammy"),
+        ("bos01", "s390x", "", "jammy"),
+        ("bos02", "ppc64el", "", "jammy"),
+        ("bos02", "s390x", "", "jammy"),
+        ("bos03", "amd64", "", "jammy"),
+        ("lcy02", "amd64", "", "jammy"),
         ],
     "production": [
-        ("bos03", "amd64", "noble"),
-        ("bos03", "amd64-gpu", "focal"),
-        ("bos03", "arm64", "noble"),
-        ("bos03", "arm64-gpu", "focal"),
-        ("bos03", "ppc64el", "focal"),
-        ("bos03", "riscv64", "noble"),
-        ("bos03", "s390x", "focal"),
-        ("lcy02", "amd64", "noble"),
+        ("bos03", "amd64", "", "noble"),
+        ("bos03", "amd64", "-gpu", "focal"),
+        ("bos03", "arm64", "", "noble"),
+        ("bos03", "arm64", "-gpu", "focal"),
+        ("bos03", "ppc64el", "", "focal"),
+        ("bos03", "riscv64", "", "noble"),
+        ("bos03", "s390x", "", "focal"),
+        ("lcy02", "amd64", "", "noble"),
         ],
     }
 
@@ -61,12 +61,12 @@ def main():
     targets = targets_by_stage[stage]
     juju_services = utils.juju_services()
     failed_target_applications = []
-    for region, arch, series in targets:
-        application = f"glance-simplestreams-sync-{region}-{arch}"
+    for region, arch, arch_suffix, series in targets:
+        application = f"glance-simplestreams-sync-{region}-{arch}{arch_suffix}"
         unit = get_leader_unit(juju_services, application)
         rebuild_cmd = [
             "juju", "ssh", unit, "sudo", "/usr/local/bin/rebuild-latest-image",
-            f"{name_prefix}/ubuntu-{series}-daily-{arch}-",
+            f"{name_prefix}{arch_suffix}/ubuntu-{series}-daily-{arch}-",
             ]
         try:
             utils.run(None, rebuild_cmd)