Merge #2585

2585: [custom] fix `snapcraft:devel` image name r=townsend2010 a=Saviq Co-authored-by: Michał Sawicz <[email protected]>
canonical · May 24, 2022 · d723040 · d723040
1 parent e2b6065
commit d723040
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/daemon/custom_image_host.cpp b/src/daemon/custom_image_host.cpp
@@ -106,7 +106,7 @@ const QMap<QString, QMap<QString, CustomImageInfo>> snapcraft_image_info{
         "jammy-server-cloudimg-amd64-vmlinuz-generic",
         "https://cloud-images.ubuntu.com/buildd/releases/jammy/release/unpacked/"
         "jammy-server-cloudimg-amd64-initrd-generic"}},
-      {{"kinetic-server-cloudimg-amd64-disk.img"},
+      {{"kinetic-server-cloudimg-amd64-disk1.img"},
        {"https://cloud-images.ubuntu.com/buildd/daily/kinetic/current/",
         {"devel"},
         "",

diff --git a/tests/test_custom_image_host.cpp b/tests/test_custom_image_host.cpp
@@ -52,7 +52,7 @@ constexpr auto sha256_sums =
     "96107afaa1673577c91dfbe2905a823043face65be6e8a0edc82f6b932d8380c  bionic-server-cloudimg-amd64-disk.img\n"
     "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  focal-server-cloudimg-amd64-disk.img\n"
     "aa61059ac29fcca26b19256d3b6dcebc8ade03f96ebf0fa201d5f6210eaa0e0c  jammy-server-cloudimg-amd64-disk.img\n"
-    "872e3f03b57300260c3f982f07183a8480d724d566c686fddc1a2fde0d411ec5  kinetic-server-cloudimg-amd64-disk.img";
+    "872e3f03b57300260c3f982f07183a8480d724d566c686fddc1a2fde0d411ec5  kinetic-server-cloudimg-amd64-disk1.img";
 
 struct CustomImageHost : public Test
 {
@@ -130,7 +130,7 @@ INSTANTIATE_TEST_SUITE_P(
                    "Snapcraft builder for Core 22"},
         CustomData{
             std::vector<std::string>{"devel"}, "snapcraft",
-            "https://cloud-images.ubuntu.com/buildd/daily/kinetic/current/kinetic-server-cloudimg-amd64-disk.img",
+            "https://cloud-images.ubuntu.com/buildd/daily/kinetic/current/kinetic-server-cloudimg-amd64-disk1.img",
             "872e3f03b57300260c3f982f07183a8480d724d566c686fddc1a2fde0d411ec5", "snapcraft-devel",
             "Snapcraft builder for the devel series"}));