Merge ~mwhudson/ubuntu-cdimage:local-artifacts into ubuntu-cdimage:main

[Michael Hudson-Doyle]

add a way to use a local download of a livefs

A slightly prettied up version of the hacks I've always been using to run cdimage locally.

[Michael Hudson-Doyle (mwhudson)]

fwiw I've built an ISO with this (and a hack to mirror.py)

934febf... by Michael Hudson-Doyle on 2023-12-04

fix unbound local in build_image_set_locked

Unmerged commits

934febf... by Michael Hudson-Doyle on 2023-12-04

fix unbound local in build_image_set_locked

	run-tests:0 (build)
	lint:0 (build)

1 → 2 of 2 results

First • Previous • Next • Last

c1af884... by Michael Hudson-Doyle on 2023-11-17

add a way to use a local download of a livefs

diff --git a/lib/cdimage/build.py b/lib/cdimage/build.py
index e60da8d..58baceb 100644
--- a/lib/cdimage/build.py
+++ b/lib/cdimage/build.py
@@ -636,6 +636,7 @@ def build_image_set_locked(config, options):
             config.limit_arches(live_successful)
         else:
             tracker_set_rebuild_status(config, [0, 1], 2)
+            builds = []
 
         if not is_live_fs_only(config):
             sync_local_mirror(config)
diff --git a/lib/cdimage/livefs.py b/lib/cdimage/livefs.py
index 45265be..0f12c94 100644
--- a/lib/cdimage/livefs.py
+++ b/lib/cdimage/livefs.py
@@ -23,6 +23,7 @@ from gzip import GzipFile
 import io
 import os
 import re
+import shutil
 import subprocess
 from textwrap import dedent
 import time
@@ -613,6 +614,9 @@ def live_output_directory(config):
 
 
 def download_live_items(config, builds, arch, item):
+    if config['CDIMAGE_LOCAL_LIVEFS_ARTIFACTS']:
+        return True
+
     output_dir = live_output_directory(config)
     found = False
 
@@ -708,6 +712,18 @@ def download_live_filesystems(config, builds):
     output_dir = live_output_directory(config)
     osextras.mkemptydir(output_dir)
 
+    if config["CDIMAGE_LOCAL_LIVEFS_ARTIFACTS"]:
+        assert len(config.arches) == 1
+        arch = config.arches[0]
+        artifacts_dir = config["CDIMAGE_LOCAL_LIVEFS_ARTIFACTS"]
+        for srcname in os.listdir(artifacts_dir):
+            destname = srcname.replace(
+                f'livecd.{config["PROJECT"]}.', f'{arch}.')
+            srcpath = os.path.join(artifacts_dir, srcname)
+            destpath = os.path.join(output_dir, destname)
+            logger.info("copying %r to %r", srcpath, destpath)
+            shutil.copy(srcpath, destpath)
+
     if (config["CDIMAGE_LIVE"] or config["CDIMAGE_SQUASHFS_BASE"] or
             config["CDIMAGE_PREINSTALLED"]):
         got_image = False