Add gardenlinux 1312.1 (#707)

Signed-off-by: Christian Berendt <berendt@osism.tech>
osism · Dec 18, 2023 · 161d724 · 161d724
1 parent a24a9ac
commit 161d724
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/etc/images/gardenlinux.yml b/etc/images/gardenlinux.yml
@@ -2,6 +2,7 @@
 images:
   - name: Garden Linux
     enable: true
+    shortname: gardenlinux
     format: qcow2
     login: admin
     min_disk: 10
@@ -37,3 +38,8 @@ images:
         url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-image-gardenlinux/gardenlinux-amd64.934.11.qcow2
         checksum: "sha256:616a217afe692ba8b6a9eca3a99291414b77a819c18430e6cba1b01a7ba6238b"
         build_date: 2023-10-25
+      - version: '1312.1'
+        url: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-image-gardenlinux/1312.1/openstack-gardener_prod-amd64-1312.1-c6ebc74e.qcow2
+        source: https://github.com/gardenlinux/gardenlinux/releases/download/1312.1/openstack-gardener_prod-amd64-1312.1-c6ebc74e.tar.xz
+        checksum: "sha256:12a67458959dabd8c4fa38f0224aa37f8e18629c218bbb716f411575a068663c"
+        build_date: 2023-11-22
diff --git a/openstack_image_manager/mirror.py b/openstack_image_manager/mirror.py
@@ -114,27 +114,28 @@ def main(
             except S3Error:
                 logger.info(f"File {filename} not yet available in bucket {dirname}")
 
-                logger.info(f"Downloading {version['source']}")
-                response = requests.get(
-                    version["source"], stream=True, allow_redirects=True
-                )
-                with open(os.path.basename(path.path), "wb") as fp:
-                    shutil.copyfileobj(response.raw, fp)
-                del response
+                if not isfile(os.path.basename(path.path)):
+                    logger.info(f"Downloading {version['source']}")
+                    response = requests.get(
+                        version["source"], stream=True, allow_redirects=True
+                    )
+                    with open(os.path.basename(path.path), "wb") as fp:
+                        shutil.copyfileobj(response.raw, fp)
+                    del response
 
                 if fileextension in [".bz2", ".zip", ".xz", ".gz"]:
-                    logger.info(f"Decompressing '{os.path.basename(path.path)}'")
+                    logger.info(f"Decompressing {os.path.basename(path.path)}")
                     patoolib.extract_archive(os.path.basename(path.path), outdir=".")
                     os.remove(os.path.basename(path.path))
 
                 if not dry_run:
-                    logger.info(f"Uploading '{filename}' to '{dirname}'")
+                    logger.info(f"Uploading {filename} to bucket {dirname}")
                     client.fput_object(
                         minio_bucket, os.path.join(dirname, filename), filename
                     )
                 else:
                     logger.info(
-                        f"Not uploading '{filename}' to '{dirname}' (dry-run enabled)"
+                        f"Not uploading {filename} to bucket {dirname} (dry-run enabled)"
                     )
 
                 os.remove(filename)