Lubuntu/ci-tooling
8
0
Fork 0
mirror of https://github.com/lubuntu-team/ci-tooling.git synced 2025-05-06 14:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add separate upload targets.

Browse Source
This commit is contained in:
Simon Quigley 2019-04-13 13:32:01 -05:00
parent 179887a432
commit 80f4d4697f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci/jobgenerator.py
View File

@ -72,7 +72,8 @@ class Generator:
metadata_conf = self.clone_metadata() metadata_conf = self.clone_metadata()
metadata_req_keys = ["name", "packaging_url", metadata_req_keys = ["name", "packaging_url",
"packaging_branch_unstable", "packaging_branch_unstable",
"packaging_branch_stable", "upload_target", "packaging_branch_stable",
"upload_target_unstable", "upload_target_stable",
"releases", "default_branch"] "releases", "default_branch"]
metadata_opt_keys = ["upstream_url", "upstream_branch"] metadata_opt_keys = ["upstream_url", "upstream_branch"]
@ -126,6 +127,8 @@ class Generator:
url = data["packaging_url"] url = data["packaging_url"]
u_branch = data["packaging_branch_unstable"] u_branch = data["packaging_branch_unstable"]
s_branch = data["packaging_branch_stable"] s_branch = data["packaging_branch_stable"]
u_upload_target = data["upload_target_unstable"]
s_upload_target = data["upload_target_stable"]
if job_type.startswith("package"): if job_type.startswith("package"):
upstream = data["upstream_url"] upstream = data["upstream_url"]
@ -136,7 +139,8 @@ class Generator:
UPSTREAM_URL=upstream, UPSTREAM_URL=upstream,
NAME=data["name"], NAME=data["name"],
RELEASE=data["release"], RELEASE=data["release"],
UPLOAD_TARGET=upload_target) UPLOAD_TARGET_U=u_upload_target,
UPLOAD_TARGET_S=s_upload_target)
elif job_type == "merger": elif job_type == "merger":
default_branch = data["default_branch"] default_branch = data["default_branch"]
package_config = template.render(PACKAGING_URL=url, package_config = template.render(PACKAGING_URL=url,