cli: drop --build-env argument
Drop the --build-env command-line argument. It is not used by anything. Furthermore, our manifests now allow embedding build-environments, so there is little reason to continue supporting this.
This commit is contained in:
parent
f2a3423caa
commit
19c74c3e8d
3 changed files with 0 additions and 16 deletions
|
|
@ -37,8 +37,6 @@ The following command-line options are supported. If an option is passed, which
|
||||||
is not listed here, **osbuild** will deny startup and exit with an error.
|
is not listed here, **osbuild** will deny startup and exit with an error.
|
||||||
|
|
||||||
-h, --help print usage information and exit immediately
|
-h, --help print usage information and exit immediately
|
||||||
--build-env=PATH json file containing a description of the build
|
|
||||||
environment
|
|
||||||
--store=DIR directory where intermediary file system trees
|
--store=DIR directory where intermediary file system trees
|
||||||
are stored
|
are stored
|
||||||
--sources=PATH json file containing a dictionary of source
|
--sources=PATH json file containing a dictionary of source
|
||||||
|
|
|
||||||
|
|
@ -73,8 +73,6 @@ def parse_arguments(sys_argv):
|
||||||
|
|
||||||
parser.add_argument("manifest_path", metavar="MANIFEST",
|
parser.add_argument("manifest_path", metavar="MANIFEST",
|
||||||
help="json file containing the manifest that should be built, or a '-' to read from stdin")
|
help="json file containing the manifest that should be built, or a '-' to read from stdin")
|
||||||
parser.add_argument("--build-env", metavar="FILE", type=os.path.abspath,
|
|
||||||
help="json file containing a description of the build environment")
|
|
||||||
parser.add_argument("--store", metavar="DIRECTORY", type=os.path.abspath,
|
parser.add_argument("--store", metavar="DIRECTORY", type=os.path.abspath,
|
||||||
default=".osbuild",
|
default=".osbuild",
|
||||||
help="directory where intermediary os trees are stored")
|
help="directory where intermediary os trees are stored")
|
||||||
|
|
@ -121,11 +119,6 @@ def osbuild_cli(*, sys_argv=[]):
|
||||||
|
|
||||||
pipeline = osbuild.load(pipeline, sources_options)
|
pipeline = osbuild.load(pipeline, sources_options)
|
||||||
|
|
||||||
if args.build_env:
|
|
||||||
with open(args.build_env) as f:
|
|
||||||
build_pipeline, runner = osbuild.load_build(json.load(f), sources_options)
|
|
||||||
pipeline.prepend_build_env(build_pipeline, runner)
|
|
||||||
|
|
||||||
secrets = {}
|
secrets = {}
|
||||||
if args.secrets:
|
if args.secrets:
|
||||||
with open(args.secrets) as f:
|
with open(args.secrets) as f:
|
||||||
|
|
|
||||||
|
|
@ -185,13 +185,6 @@ class Pipeline:
|
||||||
build = self.build.tree_id if self.build else None
|
build = self.build.tree_id if self.build else None
|
||||||
self.assembler = Assembler(name, build, self.tree_id, options or {})
|
self.assembler = Assembler(name, build, self.tree_id, options or {})
|
||||||
|
|
||||||
def prepend_build_env(self, build_pipeline, runner):
|
|
||||||
pipeline = self
|
|
||||||
while pipeline.build:
|
|
||||||
pipeline = pipeline.build
|
|
||||||
pipeline.build = build_pipeline
|
|
||||||
pipeline.runner = runner
|
|
||||||
|
|
||||||
def description(self, *, with_id=False):
|
def description(self, *, with_id=False):
|
||||||
description = {}
|
description = {}
|
||||||
if self.build:
|
if self.build:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue