| |
@@ -79,8 +79,14 @@
|
| |
self.log_debug("skip: no arches")
|
| |
continue
|
| |
|
| |
- release = self.get_release(image_conf)
|
| |
- target = self.get_config(image_conf, "target")
|
| |
+ # these properties can be set per-image *or* as e.g.
|
| |
+ # kiwibuild_description_scm or global_release in the config
|
| |
+ generics = {
|
| |
+ "release": self.get_release(image_conf),
|
| |
+ "target": self.get_config(image_conf, "target"),
|
| |
+ "descscm": self.get_config(image_conf, "description_scm"),
|
| |
+ "descpath": self.get_config(image_conf, "description_path")
|
| |
+ }
|
| |
|
| |
repo = self._get_repo(image_conf, variant)
|
| |
|
| |
@@ -97,8 +103,7 @@
|
| |
variant,
|
| |
image_conf,
|
| |
build_arches,
|
| |
- release,
|
| |
- target,
|
| |
+ generics,
|
| |
repo,
|
| |
can_fail,
|
| |
)
|
| |
@@ -109,16 +114,7 @@
|
| |
|
| |
class RunKiwiBuildThread(WorkerThread):
|
| |
def process(self, item, num):
|
| |
- (
|
| |
- compose,
|
| |
- variant,
|
| |
- config,
|
| |
- arches,
|
| |
- release,
|
| |
- target,
|
| |
- repo,
|
| |
- can_fail,
|
| |
- ) = item
|
| |
+ (compose, variant, config, arches, generics, repo, can_fail) = item
|
| |
self.can_fail = can_fail
|
| |
self.num = num
|
| |
with util.failable(
|
| |
@@ -129,21 +125,21 @@
|
| |
"kiwibuild",
|
| |
logger=self.pool._logger,
|
| |
):
|
| |
- self.worker(compose, variant, config, arches, release, target, repo)
|
| |
+ self.worker(compose, variant, config, arches, generics, repo)
|
| |
|
| |
- def worker(self, compose, variant, config, arches, release, target, repo):
|
| |
+ def worker(self, compose, variant, config, arches, generics, repo):
|
| |
msg = "kiwibuild task for variant %s" % variant.uid
|
| |
self.pool.log_info("[BEGIN] %s" % msg)
|
| |
koji = kojiwrapper.KojiWrapper(compose)
|
| |
koji.login()
|
| |
|
| |
task_id = koji.koji_proxy.kiwiBuild(
|
| |
- target,
|
| |
+ generics["target"],
|
| |
arches,
|
| |
- config["description_scm"],
|
| |
- config["description_path"],
|
| |
+ generics["descscm"],
|
| |
+ generics["descpath"],
|
| |
profile=config["kiwi_profile"],
|
| |
- release=release,
|
| |
+ release=generics["release"],
|
| |
repos=repo,
|
| |
optional_arches=self.can_fail,
|
| |
)
|
| |
adamwill
commented a year ago
Neal wanted this to work - he tried using global_description_scm
and global_description_path in the initial PR - but it wasn't
wired up to work. This should make it possible to set
kiwibuild_description_scmandkiwibuild_description_path.It also technically lets you set
global_for both, since theget_configimplementation is very generic, but it doesn't addit to the checks, so you'd still get an "unrecognized config
option" warning, I think. It seems appropriate to encourage
setting this as a phase-level option rather than a global one
since it seems quite specific to the kiwibuild phase.
Signed-off-by: Adam Williamson awilliam@redhat.com