Closed Bug 1343524 Opened 4 years ago Closed 4 years ago

Split en-US beetmover config

Categories

(Release Engineering :: Release Automation: Other, enhancement, P1)

enhancement

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: rail, Assigned: rail)

References

Details

Attachments

(3 files)

We need to aggregate files from different tasks, so we need to split the en-US beetmover config (at least) to make this happen.
Keywords: leave-open
Comment on attachment 8842924 [details]
Bug 1343524 - Split en-US beetmover config  a=release DONTBUILD

https://reviewboard.mozilla.org/r/116664/#review118552

I've lost touch with tcmigration tier 1 CI -> relpro but I think this makes sense
Comment on attachment 8842924 [details]
Bug 1343524 - Split en-US beetmover config  a=release DONTBUILD

https://reviewboard.mozilla.org/r/116664/#review118554
Attachment #8842924 - Flags: review?(jlund) → review+
Pushed by raliiev@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/60be4c3bdc76
Split en-US beetmover config r=jlund a=release DONTBUILD
https://hg.mozilla.org/releases/mozilla-aurora/rev/b48af7ab022592485ef72fb0250c447ea6156c80
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
This broke 52.0.1esr with:

07:37:50     INFO - generating manifest from configs/beetmover/en_us_signing.yml.tmpl...
07:37:50     INFO - [mozharness: 2017-03-17 07:37:50.891070Z] Finished generate-candidates-manifest step (failed)
07:37:50    FATAL - Uncaught exception: Traceback (most recent call last):
07:37:50    FATAL -   File "/mozharness/mozharness/base/script.py", line 2034, in run
07:37:50    FATAL -     self.run_action(action)
07:37:50    FATAL -   File "/mozharness/mozharness/base/script.py", line 1973, in run_action
07:37:50    FATAL -     self._possibly_run_method(method_name, error_if_missing=True)
07:37:50    FATAL -   File "/mozharness/mozharness/base/script.py", line 1913, in _possibly_run_method
07:37:50    FATAL -     return getattr(self, method_name)()
07:37:50    FATAL -   File "scripts/release/beet_mover.py", line 224, in generate_candidates_manifest
07:37:50    FATAL -     template = jinja_env.get_template(template_file)
07:37:50    FATAL -   File "/mozharness/build/venv/lib/python2.7/site-packages/jinja2/environment.py", line 830, in get_template
07:37:50    FATAL -     return self._load_template(name, self.make_globals(globals))
07:37:50    FATAL -   File "/mozharness/build/venv/lib/python2.7/site-packages/jinja2/environment.py", line 804, in _load_template
07:37:50    FATAL -     template = self.loader.load(self, name, globals)
07:37:50    FATAL -   File "/mozharness/build/venv/lib/python2.7/site-packages/jinja2/loaders.py", line 113, in load
07:37:50    FATAL -     source, filename, uptodate = self.get_source(environment, name)
07:37:50    FATAL -   File "/mozharness/build/venv/lib/python2.7/site-packages/jinja2/loaders.py", line 187, in get_source
07:37:50    FATAL -     raise TemplateNotFound(template)
07:37:50    FATAL - TemplateNotFound: en_us_signing.yml.tmpl

eg https://mozilla-release-logs.s3.amazonaws.com/mozilla-esr52/firefox-52.0.1esr/build1/%5Bbeetmover%5D_firefox_mozilla-esr52_macosx64_en_US_completes_candidates-macosx64-bFgJYTusQjqZ6HwRwVmBeA-3

IIUC we need a version of the patch here which doesn't change linux names to target.<suffix>.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Comment on attachment 8848444 [details]
Bug 1343524 - Split en-US beetmover config (m-r, m-esr* version)  a=release DONTBUILD

https://reviewboard.mozilla.org/r/121364/#review123368

::: testing/mozharness/configs/beetmover/en_us_build.yml.tmpl:85
(Diff revision 1)
>        s3_key: {{ s3_prefix }}mar-tools/win64/mbsdiff.exe
>    {% endif %}
>  
>    {% if platform == "linux-i686" %}
> -    package:
> -      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.tar.bz2
> +    buildinfo:
> +      artifact: {{ artifact_base_url }}/firefox-{{ app_version }}.{{ locale }}.{{ platform }}.json

Callout for anybody who may read this patch in the future: this line is different from the original patch.

The major takeaway of this patch compared to the other => We don't reference target.*, but firefox-{{ app_version }}.{{ locale }}.{{ platform }}.tar.*

::: testing/mozharness/configs/beetmover/en_us_build.yml.tmpl:151
(Diff revision 1)
>        s3_key: {{ s3_prefix }}firefox-{{ version }}.{{ platform }}.sdk.tar.bz2
>      mar_tools_mar:
>        artifact: {{ artifact_base_url }}/mar
>        s3_key: {{ s3_prefix }}mar-tools/linux64/mar
>      mar_tools_mbdiff:
> -      artifact: {{ artifact_base_url }}/mbsdiff
> +      artifact: {{ artifact_base_url }}//mbsdiff

Nit: I don't think we need this extra /
Attachment #8848444 - Flags: review?(jlorenzo) → review+
In reply to comment #13:

I compared the 2 diffs side by side, I didn't find anything outstanding. I didn't catch any reference to target.* in that patch. Looks good to me, modulo that nit
Status: REOPENED → RESOLVED
Closed: 4 years ago4 years ago
Resolution: --- → FIXED
Removing leave-open keyword from resolved bugs, per :sylvestre.
Keywords: leave-open
You need to log in before you can comment on or make changes to this bug.