stages: add support for --target-imgref to bootc install to-filesystem
We currently do not set the `--target-imgref` and do not allow to override it. This means that on a fresh deploy it is set to an incorrect value. This commit allows to set it via the org.osbuild.bootc.install-to-filesystem stage.
This commit is contained in:
parent
2586a748fd
commit
388e367392
3 changed files with 13 additions and 2 deletions
|
|
@ -40,6 +40,9 @@ def main(options, inputs, paths):
|
||||||
# customize kernel-args
|
# customize kernel-args
|
||||||
for karg in options.get("kernel-args", []):
|
for karg in options.get("kernel-args", []):
|
||||||
pargs.extend(["--karg", karg])
|
pargs.extend(["--karg", karg])
|
||||||
|
target_imgref = options.get("target-imgref")
|
||||||
|
if target_imgref:
|
||||||
|
pargs.extend(["--target-imgref", target_imgref])
|
||||||
# add target and go
|
# add target and go
|
||||||
pargs.append(dst)
|
pargs.append(dst)
|
||||||
subprocess.run(pargs, env=env, check=True)
|
subprocess.run(pargs, env=env, check=True)
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,10 @@
|
||||||
"items": {
|
"items": {
|
||||||
"type": "string"
|
"type": "string"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"target-imgref": {
|
||||||
|
"description": "Specify the image to fetch for subsequent updates",
|
||||||
|
"type": "string"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -53,9 +53,13 @@ FAKE_INPUTS = {
|
||||||
({"kernel-args": ["arg1", "arg2"]}, ["--karg", "arg1", "--karg", "arg2"]),
|
({"kernel-args": ["arg1", "arg2"]}, ["--karg", "arg1", "--karg", "arg2"]),
|
||||||
# all
|
# all
|
||||||
({"root-ssh-authorized-keys": ["key1", "key2"],
|
({"root-ssh-authorized-keys": ["key1", "key2"],
|
||||||
"kernel-args": ["arg1", "arg2"]},
|
"kernel-args": ["arg1", "arg2"],
|
||||||
|
"target-imgref": "quay.io/img/ref",
|
||||||
|
},
|
||||||
["--root-ssh-authorized-keys", "/tmp/fake-named-tmpfile-name",
|
["--root-ssh-authorized-keys", "/tmp/fake-named-tmpfile-name",
|
||||||
"--karg", "arg1", "--karg", "arg2"],
|
"--karg", "arg1", "--karg", "arg2",
|
||||||
|
"--target-imgref", "quay.io/img/ref",
|
||||||
|
],
|
||||||
),
|
),
|
||||||
])
|
])
|
||||||
@patch("subprocess.run")
|
@patch("subprocess.run")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue