osbuild: split BuildRoot into a reusable module
This commit is contained in:
Lars Karlitski
parent
abca9d7b03
commit
b36c8135ae
2 changed files with 103 additions and 95 deletions
97
osbuild
97
osbuild
|
|
@ -3,15 +3,9 @@
|
|||
import argparse
|
||||
import json
|
||||
import os
|
||||
import osbuild
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
|
||||
if os.path.dirname(__file__) == f"{sys.prefix}/bin":
|
||||
libdir = f"{sys.prefix}/lib"
|
||||
else:
|
||||
libdir = os.path.abspath(".")
|
||||
|
||||
|
||||
RESET = "\033[0m"
|
||||
|
|
@ -19,93 +13,6 @@ BOLD = "\033[1m"
|
|||
RED = "\033[31m"
|
||||
|
||||
|
||||
class BuildRoot:
|
||||
def __init__(self, path=None):
|
||||
self.buildroot = tempfile.mkdtemp(prefix="osbuild-buildroot-", dir=path)
|
||||
self.buildroot_mounted = False
|
||||
self.tree = tempfile.mkdtemp(prefix="osbuild-tree-", dir=path)
|
||||
self.tree_mounted = False
|
||||
try:
|
||||
subprocess.run(["mount", "-o", "bind,ro", "/", self.buildroot], check=True)
|
||||
self.tree_mounted = True
|
||||
subprocess.run(["mount", "-t", "tmpfs", "tmpfs", self.tree], check=True)
|
||||
self.buildroot_mounted = True
|
||||
except subprocess.CalledProcessError:
|
||||
self.unmount()
|
||||
raise
|
||||
|
||||
# systemd-nspawn silently removes some characters when choosing a
|
||||
# machine name from the directory name. The only one relevant for
|
||||
# us is '_', because all other characters used by
|
||||
# TemporaryDirectory() are allowed. Replace it with 'L's
|
||||
# (TemporaryDirectory() only uses lower-case characters)
|
||||
self.machine_name = os.path.basename(self.buildroot).replace("_", "L")
|
||||
|
||||
def unmount(self):
|
||||
if self.tree:
|
||||
if self.tree_mounted:
|
||||
subprocess.run(["umount", "--lazy", self.tree], check=True)
|
||||
os.rmdir(self.tree)
|
||||
self.tree = None
|
||||
if self.buildroot:
|
||||
if self.buildroot_mounted:
|
||||
subprocess.run(["umount", "--lazy", self.buildroot], check=True)
|
||||
os.rmdir(self.buildroot)
|
||||
self.buildroot = None
|
||||
|
||||
def run(self, argv, binds=[], readonly_binds=[], *args, **kwargs):
|
||||
return subprocess.run([
|
||||
"systemd-nspawn",
|
||||
"--quiet",
|
||||
"--as-pid2",
|
||||
"--link-journal=no",
|
||||
"--volatile=yes",
|
||||
f"--machine={self.machine_name}",
|
||||
f"--directory={self.buildroot}",
|
||||
f"--bind={self.tree}:/tmp/tree",
|
||||
*[f"--bind={src}:{dest}" for src, dest in binds],
|
||||
*[f"--bind-ro={src}:{dest}" for src, dest in readonly_binds]
|
||||
] + argv, *args, **kwargs)
|
||||
|
||||
def run_stage(self, stage, options={}, input_dir=None, output_dir=None, sit=False):
|
||||
options = {
|
||||
**options,
|
||||
"tree": "/tmp/tree",
|
||||
"input_dir": None
|
||||
}
|
||||
|
||||
binds = [
|
||||
(f"{libdir}/run-stage", "/tmp/run-stage"),
|
||||
(f"{libdir}/stages/{stage}", "/tmp/stage"),
|
||||
("/etc/pki", "/etc/pki")
|
||||
]
|
||||
|
||||
robinds = []
|
||||
if input_dir:
|
||||
options["input_dir"] = "/tmp/input"
|
||||
robinds.append((input_dir, "/tmp/input"))
|
||||
|
||||
if output_dir:
|
||||
options["output_dir"] = "/tmp/output"
|
||||
binds.append((output_dir, "/tmp/output"))
|
||||
|
||||
argv = ["/tmp/run-stage"]
|
||||
if sit:
|
||||
argv.append("--sit")
|
||||
argv.append("/tmp/stage")
|
||||
|
||||
self.run(argv, binds=binds, readonly_binds=robinds, input=json.dumps(options), encoding="utf-8", check=True)
|
||||
|
||||
def __del__(self):
|
||||
self.unmount()
|
||||
|
||||
def __enter__(self):
|
||||
return self
|
||||
|
||||
def __exit__(self, exc_type, exc_value, exc_tb):
|
||||
self.unmount()
|
||||
|
||||
|
||||
def run_stage_interactive(i, name, options, buildroot, input_dir=None, output_dir=None, sit=False):
|
||||
print()
|
||||
print(f"{RESET}{BOLD}{i}. {name}{RESET} " + json.dumps(options or {}, indent=2))
|
||||
|
|
@ -136,7 +43,7 @@ def run_interactive(pipeline_path, input_dir, output_dir, sit):
|
|||
with open(pipeline_path) as f:
|
||||
pipeline = json.load(f)
|
||||
|
||||
with BuildRoot("/run/osbuild") as buildroot:
|
||||
with osbuild.BuildRoot("/run/osbuild") as buildroot:
|
||||
for i, stage in enumerate(pipeline["stages"], start=1):
|
||||
name = stage["name"]
|
||||
options = stage.get("options", {})
|
||||
|
|
|
|||
101
osbuild.py
Normal file
101
osbuild.py
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
|
||||
__all__ = [ "BuildRoot" ]
|
||||
|
||||
|
||||
libdir = os.path.dirname(__file__)
|
||||
if not os.path.exists(f"{libdir}/stages"):
|
||||
libdir = f"{sys.prefix}/lib"
|
||||
|
||||
|
||||
class BuildRoot:
|
||||
def __init__(self, path=None):
|
||||
self.buildroot = tempfile.mkdtemp(prefix="osbuild-buildroot-", dir=path)
|
||||
self.buildroot_mounted = False
|
||||
self.tree = tempfile.mkdtemp(prefix="osbuild-tree-", dir=path)
|
||||
self.tree_mounted = False
|
||||
try:
|
||||
subprocess.run(["mount", "-o", "bind,ro", "/", self.buildroot], check=True)
|
||||
self.tree_mounted = True
|
||||
subprocess.run(["mount", "-t", "tmpfs", "tmpfs", self.tree], check=True)
|
||||
self.buildroot_mounted = True
|
||||
except subprocess.CalledProcessError:
|
||||
self.unmount()
|
||||
raise
|
||||
|
||||
# systemd-nspawn silently removes some characters when choosing a
|
||||
# machine name from the directory name. The only one relevant for
|
||||
# us is '_', because all other characters used by
|
||||
# TemporaryDirectory() are allowed. Replace it with 'L's
|
||||
# (TemporaryDirectory() only uses lower-case characters)
|
||||
self.machine_name = os.path.basename(self.buildroot).replace("_", "L")
|
||||
|
||||
def unmount(self):
|
||||
if self.tree:
|
||||
if self.tree_mounted:
|
||||
subprocess.run(["umount", "--lazy", self.tree], check=True)
|
||||
os.rmdir(self.tree)
|
||||
self.tree = None
|
||||
if self.buildroot:
|
||||
if self.buildroot_mounted:
|
||||
subprocess.run(["umount", "--lazy", self.buildroot], check=True)
|
||||
os.rmdir(self.buildroot)
|
||||
self.buildroot = None
|
||||
|
||||
def run(self, argv, binds=[], readonly_binds=[], *args, **kwargs):
|
||||
return subprocess.run([
|
||||
"systemd-nspawn",
|
||||
"--quiet",
|
||||
"--as-pid2",
|
||||
"--link-journal=no",
|
||||
"--volatile=yes",
|
||||
f"--machine={self.machine_name}",
|
||||
f"--directory={self.buildroot}",
|
||||
f"--bind={self.tree}:/tmp/tree",
|
||||
*[f"--bind={src}:{dest}" for src, dest in binds],
|
||||
*[f"--bind-ro={src}:{dest}" for src, dest in readonly_binds]
|
||||
] + argv, *args, **kwargs)
|
||||
|
||||
def run_stage(self, stage, options={}, input_dir=None, output_dir=None, sit=False):
|
||||
options = {
|
||||
**options,
|
||||
"tree": "/tmp/tree",
|
||||
"input_dir": None
|
||||
}
|
||||
|
||||
binds = [
|
||||
(f"{libdir}/run-stage", "/tmp/run-stage"),
|
||||
(f"{libdir}/stages/{stage}", "/tmp/stage"),
|
||||
("/etc/pki", "/etc/pki")
|
||||
]
|
||||
|
||||
robinds = []
|
||||
if input_dir:
|
||||
options["input_dir"] = "/tmp/input"
|
||||
robinds.append((input_dir, "/tmp/input"))
|
||||
|
||||
if output_dir:
|
||||
options["output_dir"] = "/tmp/output"
|
||||
binds.append((output_dir, "/tmp/output"))
|
||||
|
||||
argv = ["/tmp/run-stage"]
|
||||
if sit:
|
||||
argv.append("--sit")
|
||||
argv.append("/tmp/stage")
|
||||
|
||||
self.run(argv, binds=binds, readonly_binds=robinds, input=json.dumps(options), encoding="utf-8", check=True)
|
||||
|
||||
def __del__(self):
|
||||
self.unmount()
|
||||
|
||||
def __enter__(self):
|
||||
return self
|
||||
|
||||
def __exit__(self, exc_type, exc_value, exc_tb):
|
||||
self.unmount()
|
||||
Loading…
Add table
Add a link
Reference in a new issue