Closed Bug 874712 Opened 7 years ago Closed 7 years ago

TB 22.0b1 - Issues with l10n repacks & lighting

Categories

(Thunderbird :: Build Config, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
Thunderbird 22.0

People

(Reporter: hwine, Assigned: standard8)

Details

Attachments

(1 file)

Thunderbird Beta 22.0b1 build fails in repacks with errors similar to:
    command: START
    command: make installers-fr
    command: cwd: comm-beta/obj-l10n/mail/locales
    command: env: {'MOZ_MAKE_COMPLETE_MAR': '1', 'AB_CD': 'fr', 'MOZ_SIGN_CMD': 'python /builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/scripts/release/signing/signtool.py --cachedir /builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/signing_cache -t /builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/token -n /builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/nonce -c /builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/scripts/release/signing/host.cert -H signing1.build.scl1.mozilla.com:9120 -H signing2.build.scl1.mozilla.com:9120 -H signing3.srv.releng.scl3.mozilla.com:9120', 'UPLOAD_SSH_KEY': '~/.ssh/tbirdbld_dsa', 'LOCALE_MERGEDIR': '/builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/comm-beta/obj-l10n/mail/locales/merged', 'COMM_REV': 'THUNDERBIRD_22_0b1_RELEASE', 'MOZ_OBJDIR': 'obj-l10n', 'MAR': '/builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/comm-beta/obj-l10n/mozilla/dist/host/bin/mar', 'UPLOAD_TO_TEMP': '1', 'LD_LIBRARY_PATH': '/tools/gcc-4.3.3/installed/lib', 'ZIP_IN': '/builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/thunderbird.tar.bz2', 'UPLOAD_USER': 'tbirdbld', 'MBSDIFF': '/builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/comm-beta/obj-l10n/mozilla/dist/host/bin/mbsdiff', 'UPLOAD_EXTRA_FILES': 'update/linux-i686/el/thunderbird-21.0b1-22.0b1.partial.mar update/linux-i686/el/thunderbird-21.0b1-22.0b1.partial.mar.asc', 'UPLOAD_HOST': 'stage.mozilla.org', 'POST_UPLOAD_CMD': 'post_upload.py -p thunderbird -n 1 -v 22.0b1 --release-to-candidates-dir --signed', 'MOZILLA_REV': 'THUNDERBIRD_22_0b1_RELEASE', 'MOZ_PKG_PRETTYNAMES': '1', 'MOZ_PKG_VERSION': '22.0b1'}
    command: output:
    make -C ../../calendar/lightning langpack-fr
    make[1]: Entering directory `/builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/comm-beta/obj-l10n/calendar/lightning'
    make L10N_XPI_NAME=lightning-fr L10N_XPI_PKGNAME=lightning-2.4b1.fr.linux-i686 AB_CD=fr \
              recreate-platformini repack-stage repack-process-extrafiles libs-fr
    make[2]: Entering directory `/builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/comm-beta/obj-l10n/calendar/lightning'
    make[2]: Nothing to be done for `recreate-platformini'.
    Repackaging lightning-2.4b1.fr.linux-i686 locale for Language fr
    rm -f -rf ../../mozilla/dist/xpi-stage/lightning-fr
    cp -R ../../mozilla/dist/xpi-stage/lightning ../../mozilla/dist/xpi-stage/lightning-fr
    grep -v 'locale \w\+ en-US' ../../mozilla/dist/xpi-stage/lightning-fr/chrome.manifest > ../../mozilla/dist/xpi-stage/lightning-fr/chrome.manifest~ && \
              mv ../../mozilla/dist/xpi-stage/lightning-fr/chrome.manifest~ ../../mozilla/dist/xpi-stage/lightning-fr/chrome.manifest
    grep: ../../mozilla/dist/xpi-stage/lightning-fr/chrome.manifest: No such file or directory
    make[2]: Leaving directory `/builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/comm-beta/obj-l10n/calendar/lightning'
    make[2]: *** [repack-stage] Error 2
    make[1]: *** [langpack-fr] Error 2
    make[1]: Leaving directory `/builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/comm-beta/obj-l10n/calendar/lightning'
    command: ERROR
    Traceback (most recent call last):
      File "/builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/scripts/scripts/l10n/../../lib/python/util/commands.py", line 46, in run_cmd
        return subprocess.check_call(cmd, **kwargs)
      File "/usr/lib/python2.6/subprocess.py", line 502, in check_call
        raise CalledProcessError(retcode, cmd)
    CalledProcessError: Command '['make', 'installers-fr']' returned non-zero exit status 2
    command: END (1.33s elapsed)

    The following tracebacks were detected during repacks:
    de:
    Traceback (most recent call last):
      File "/builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/scripts/scripts/l10n/create-release-repacks.py", line 98, in createRepacks
        version=version, partialUpdates=partialUpdates)
      File "/builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/scripts/scripts/l10n/../../lib/python/build/l10n.py", line 88, in repackLocale
        run_cmd(["make", "installers-%s" % locale], cwd=localeSrcDir, env=env)
      File "/builds/slave/tb-rel-c-beta-lx_rpk_2-0000000/scripts/scripts/l10n/../../lib/python/util/commands.py", line 46, in run_cmd
        return subprocess.check_call(cmd, **kwargs)
      File "/usr/lib/python2.6/subprocess.py", line 502, in check_call
        raise CalledProcessError(retcode, cmd)
    CalledProcessError: Command '['make', 'installers-de']' returned non-zero exit status 2

See also other repack errors in:
  https://ftp.mozilla.org/pub/mozilla.org/thunderbird/candidates/22.0b1-candidates/build1/logs/
Not important at this stage but,

"Skipping langpack-ar as it is not in Lightning's "

is due to: @echo "Skipping $@ as it is not in Lightning's $(LOCALES_FILENAME)"

which should use $(CAL_LOCALES).
Attached patch Possible fixSplinter Review
Ok, this might do it. From looking at the logs, the first failed locale in each log is due to the en-US file not being downloaded & found correctly. The subsequent failures look like either en-US has been downloaded and found, or the unpack has been created ok, but not fully run.

To fix the first, I noticed the _ABS_DIST variable was referenced wrongly for the _ABS_XPI_STAGE_PATH location.

I think the subsequent failures might just be fixed as a result of getting that right, but I'm not sure.

I'm also not convinced about this section:

http://hg.mozilla.org/releases/comm-beta/file/639c12018907/calendar/lightning/lightning-packager.mk#l158

Where the lightning repackaging seems to be changing the core Thunderbird platform.ini - that doesn't seem right.
Attachment #752587 - Flags: review?(philipp)
(In reply to Mark Banner (:standard8) from comment #2)
> http://hg.mozilla.org/releases/comm-beta/file/639c12018907/calendar/
> lightning/lightning-packager.mk#l158
> 
> Where the lightning repackaging seems to be changing the core Thunderbird
> platform.ini - that doesn't seem right.
If the file already exists, then it shouldn't be overwritten, right? This is just to make sure that a platform.ini exists in case there is a repack that doesn't fully extract Thunderbird. I don't remember when I had this case, that code has been there a while.
Comment on attachment 752587 [details] [diff] [review]
Possible fix

># HG changeset patch
># Parent 3d7d2af9a03d08f884b118956eed7bdce799efc7
># User Mark Banner <bugzilla@standard8.plus.com>
>diff --git a/calendar/lightning/lightning-packager.mk b/calendar/lightning/lightning-packager.mk
>--- a/calendar/lightning/lightning-packager.mk
>+++ b/calendar/lightning/lightning-packager.mk
>@@ -34,7 +34,7 @@ EN_US_BINARY_URL = $(error You must set 
> endif
> 
> XPI_STAGE_PATH = $(DIST)/$(UNIVERSAL_PATH)xpi-stage
>-_ABS_XPI_STAGE_PATH = $(ABS_DIST)/$(UNIVERSAL_PATH)xpi-stage
>+_ABS_XPI_STAGE_PATH = $(_ABS_DIST)/$(UNIVERSAL_PATH)xpi-stage
Good catch. I wonder how this slipped through


>@@ -99,7 +99,7 @@ CAL_LOCALES = $(call apposlocales,calend
> TB_LOCALES = $(call apposlocales,mail)
> TB_SKIP_LOCALES = $(filter-out $(CAL_LOCALES) en-US,$(TB_LOCALES))
> $(addprefix langpack-,$(TB_SKIP_LOCALES)) $(addprefix upload-,$(TB_SKIP_LOCALES)):
>-	@echo "Skipping $@ as it is not in Lightning's $(LOCALES_FILENAME)"
>+	@echo "Skipping $@ as it is not in Lightning's $(CAL_LOCALES)"
Oh I see where this is coming from. I changed LOCALES_FILENAME to using the apposlocales function call last minute. So this is just a cosmetic issue. In that case I prefer wording: "Skipping $@ as it is not in Lightning's locales: $(CAL_LOCALES)"

I'll push this in in a second, r=philipp.
Attachment #752587 - Flags: review?(philipp) → review+
This should be fine, we've done a few builds after.
Assignee: nobody → mbanner
Status: NEW → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 22.0
You need to log in before you can comment on or make changes to this bug.