462179 - make installers for l10n mac repackaging should not need PKG_DMG_SOURCE as environment variable

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P3)

Description

[Armen [:armenzg]]

I cannot remember when I did started to add this environment variable to my buildbot configuration for the mac l10n repackages when I was doing testing on my mac during the summer but Axel says that it is not needed and he might be right.
I left a comment from my buildbot setup which is:
#It seems that I need to set it because of /packager.mk#144
http://mxr.mozilla.org/mozilla/source/toolkit/mozapps/installer/packager.mk#144
http://mxr.mozilla.org/mozilla-central/source/toolkit/mozapps/installer/packager.mk#144
which both of them are:
|ifndef PKG_DMG_
|PKG_DMG_SOURCE = $(STAGEPATH)$(MOZ_PKG_APPNAME)
|endif

https://bugzilla.mozilla.org/show_bug.cgi?id=460791#c10
>
>>+L10nNightlyFactory.addStep(ShellCommand,
>>+    command=["make", WithProperties("installers-%(locale)s")],
>>+    #It seems that I need to set it because of /packager.mk#144
>>+    env={'PKG_DMG_SOURCE':'firefox'},
>>+    haltOnFailure = True,
>>+    workdir="mozilla-central/browser/locales"
>>+)
>
>I didn't need that. If we do, it's a bug that should be fixed.

Comment 1

[[e-mail] (:bhearsum)]

I'm pretty sure Armen is working on this.

Comment 2

[Armen [:armenzg]]

I believe that during some of the local runs in staging-master I had PKG_DMG_SOURCE removed but unfortunately this has become part of the RepackFactory

I just want to leave this note to when I can deal with this bug and make sure that I go around and remove these

Comment 3

[Armen [:armenzg]]

Attachment: changes to the masters in 1.9.0 to don't use PKG_DMG

Comment 4

[Armen [:armenzg]]

Attachment: stop using PKG_DMG on the RepackFactory and fix small typo

Comment 5

[Armen [:armenzg]]

Attachment: stop passing the "project" variable to the RepackFactory on the master configuartions

Comment 6

[Armen [:armenzg]]

These patches have been tested on staging-master on Tuesday during the timing tests and right now is running on staging-1.9-master without any problems

Comment 7

[[e-mail] (:bhearsum)]

Comment on attachment 355139 [details] [diff] [review]
stop passing the "project" variable to the RepackFactory on the master configuartions

This is fine for the nightly builders. Please either don't remove the 'project' variable from BaseRepackFactory or move it to ReleaseRepackFactory - release builds absolutely need it.

Comment 8

[Chris Cooper [:coop] (he/him)]

Comment on attachment 355138 [details] [diff] [review]
stop using PKG_DMG on the RepackFactory and fix small typo

The change to updateSources has already landed as a bustage fix, but this is good otherwise.

Comment 9

[Armen [:armenzg]]

Attachment: master.cfg - remove TODO comment

Ben, I will still be passing the "project" variable to even the NightlyRepackFactory since I have seen that gets used for "self.postUploadCmd"

coop, these patches are ready to be checked-in (the second patch will reject the updateSources typo). Sorry if it took so long to just update this last attachment

Comment 10

[Chris Cooper [:coop] (he/him)]

Comment on attachment 357272 [details] [diff] [review]
master.cfg - remove TODO comment

changeset:   677:3f3a5d9d76a6

Comment 11

[Chris Cooper [:coop] (he/him)]

Comment on attachment 355138 [details] [diff] [review]
stop using PKG_DMG on the RepackFactory and fix small typo

Checking in factory.py;
/cvsroot/mozilla/tools/buildbotcustom/process/factory.py,v  <--  factory.py
new revision: 1.78; previous revision: 1.77
done

Comment 12

[Chris Cooper [:coop] (he/him)]

Comment on attachment 355137 [details] [diff] [review]
changes to the masters in 1.9.0 to don't use PKG_DMG

Checking in production-1.9/master.cfg;
/cvsroot/mozilla/tools/buildbot-configs/automation/production-1.9/master.cfg,v  <--  master.cfg
new revision: 1.41; previous revision: 1.40
done
Checking in staging-1.9/master.cfg;
/cvsroot/mozilla/tools/buildbot-configs/automation/staging-1.9/master.cfg,v  <--  master.cfg
new revision: 1.45; previous revision: 1.44
done

Comment 13

[Armen [:armenzg]]

did this code go live?
anything left?