--- a/taskcluster/taskgraph/transforms/beetmover_repackage.py
+++ b/taskcluster/taskgraph/transforms/beetmover_repackage.py
@@ -42,55 +42,33 @@ logger = logging.getLogger(__name__)
"target.langpack.xpi",
"host/bin/mar",
"host/bin/mbsdiff",
]
# Until bug 1331141 is fixed, if you are adding any new artifacts here that
# need to be transfered to S3, please be aware you also need to follow-up
# with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
# See example in bug 1348286
-_DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_EN_US = [
- "update/target.complete.mar",
-]
-# Until bug 1331141 is fixed, if you are adding any new artifacts here that
-# need to be transfered to S3, please be aware you also need to follow-up
-# with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
-# See example in bug 1348286
_DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N = [
"target.langpack.xpi",
"balrog_props.json",
]
-# Until bug 1331141 is fixed, if you are adding any new artifacts here that
-# need to be transfered to S3, please be aware you also need to follow-up
-# with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
-# See example in bug 1348286
-_DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_L10N = [
- "target.complete.mar",
-]
# Until bug 1331141 is fixed, if you are adding any new artifacts here that
# need to be transfered to S3, please be aware you also need to follow-up
# with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
# See example in bug 1348286
UPSTREAM_ARTIFACT_UNSIGNED_PATHS = {
'macosx64-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US,
'macosx64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
}
# Until bug 1331141 is fixed, if you are adding any new artifacts here that
# need to be transfered to S3, please be aware you also need to follow-up
# with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
# See example in bug 1348286
-UPSTREAM_ARTIFACT_SIGNED_PATHS = {
- 'macosx64-nightly': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_EN_US,
- 'macosx64-nightly-l10n': _DESKTOP_UPSTREAM_ARTIFACTS_SIGNED_L10N,
-}
-# Until bug 1331141 is fixed, if you are adding any new artifacts here that
-# need to be transfered to S3, please be aware you also need to follow-up
-# with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
-# See example in bug 1348286
UPSTREAM_ARTIFACT_REPACKAGE_PATHS = {
'macosx64-nightly': ["target.dmg"],
'macosx64-nightly-l10n': ["target.dmg"],
}
# Voluptuous uses marker objects as dictionary *keys*, but they are not
# comparable, so we cast all of the keys back to regular strings
task_description_schema = {str(k): v for k, v in task_description_schema.schema.iteritems()}
@@ -193,42 +171,34 @@ def make_task_description(config, jobs):
'attributes': attributes,
'run-on-projects': dep_job.attributes.get('run_on_projects'),
'treeherder': treeherder,
}
yield task
-def generate_upstream_artifacts(signing_task_ref, build_task_ref,
- repackage_task_ref, platform,
- locale=None):
+def generate_upstream_artifacts(build_task_ref, repackage_task_ref,
+ platform, locale=None):
- signing_mapping = UPSTREAM_ARTIFACT_SIGNED_PATHS
build_mapping = UPSTREAM_ARTIFACT_UNSIGNED_PATHS
repackage_mapping = UPSTREAM_ARTIFACT_REPACKAGE_PATHS
artifact_prefix = 'public/build'
if locale:
artifact_prefix = 'public/build/{}'.format(locale)
platform = "{}-l10n".format(platform)
upstream_artifacts = [{
"taskId": {"task-reference": build_task_ref},
"taskType": "build",
"paths": ["{}/{}".format(artifact_prefix, p)
for p in build_mapping[platform]],
"locale": locale or "en-US",
}, {
- "taskId": {"task-reference": signing_task_ref},
- "taskType": "signing",
- "paths": ["{}/{}".format(artifact_prefix, p)
- for p in signing_mapping[platform]],
- "locale": locale or "en-US",
- }, {
"taskId": {"task-reference": repackage_task_ref},
"taskType": "repackage",
"paths": ["{}/{}".format(artifact_prefix, p)
for p in repackage_mapping[platform]],
"locale": locale or "en-US",
}]
return upstream_artifacts
@@ -241,30 +211,28 @@ def make_task_worker(config, jobs):
any(['repackage' in j for j in job['dependencies']]))
if not valid_beetmover_job:
raise NotImplementedError("Beetmover_repackage must have four dependencies.")
locale = job["attributes"].get("locale")
platform = job["attributes"]["build_platform"]
build_task = None
repackage_task = None
- signing_task = None
for dependency in job["dependencies"].keys():
if 'repackage' in dependency:
repackage_task = dependency
elif 'signing' in dependency:
- signing_task = dependency
+ pass
else:
build_task = "build"
- signing_task_ref = "<" + str(signing_task) + ">"
build_task_ref = "<" + str(build_task) + ">"
repackage_task_ref = "<" + str(repackage_task) + ">"
upstream_artifacts = generate_upstream_artifacts(
- signing_task_ref, build_task_ref, repackage_task_ref, platform, locale
+ build_task_ref, repackage_task_ref, platform, locale
)
worker = {'implementation': 'beetmover',
'upstream-artifacts': upstream_artifacts}
if locale:
worker["locale"] = locale
job["worker"] = worker
--- a/taskcluster/taskgraph/transforms/build_signing.py
+++ b/taskcluster/taskgraph/transforms/build_signing.py
@@ -44,19 +44,16 @@ def make_signing_description(config, job
'format': 'jar',
},
]
elif 'macosx' in dep_job.attributes.get('build_platform'):
job_specs = [
{
'artifacts': ['public/build/target.dmg'],
'format': 'macapp',
- }, {
- 'artifacts': ['public/build/update/target.complete.mar'],
- 'format': 'mar',
},
]
else:
job_specs = [
{
'artifacts': ['public/build/target.tar.bz2'],
'format': 'gpg',
}, {