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

RESOLVED FIXED

Status

P3
normal
RESOLVED FIXED
10 years ago
6 years ago

People

(Reporter: armenzg, Assigned: armenzg)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(3 attachments, 1 obsolete attachment)

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.
I'm pretty sure Armen is working on this.
(Assignee)

Updated

10 years ago
Assignee: nobody → armenzg
Priority: -- → P3
(Assignee)

Updated

10 years ago
Blocks: 464175
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
Created attachment 355137 [details] [diff] [review]
changes to the masters in 1.9.0 to don't use PKG_DMG
Attachment #355137 - Flags: review?(ccooper)
Created attachment 355138 [details] [diff] [review]
stop using PKG_DMG on the RepackFactory and fix small typo
Attachment #355138 - Flags: review?(ccooper)
Created attachment 355139 [details] [diff] [review]
stop passing the "project" variable to the RepackFactory on the master configuartions
Attachment #355139 - Flags: review?(ccooper)
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 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.
Attachment #355138 - Flags: review?(ccooper) → review+
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.
Attachment #355137 - Flags: review?(ccooper) → review+
Attachment #355139 - Flags: review?(ccooper) → review+
(Assignee)

Updated

10 years ago
Attachment #355139 - Flags: review+
Created attachment 357272 [details] [diff] [review]
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
Attachment #355139 - Attachment is obsolete: true
Attachment #357272 - Flags: review?(ccooper)
(Assignee)

Updated

10 years ago
Keywords: checkin-needed
Attachment #357272 - Flags: review?(ccooper) → review+
Comment on attachment 357272 [details] [diff] [review]
master.cfg - remove TODO comment

changeset:   677:3f3a5d9d76a6
Attachment #357272 - Flags: checked‑in+
Attachment #355138 - Flags: checked‑in+
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 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
Attachment #355137 - Flags: checked‑in+
Keywords: checkin-needed
OS: Mac OS X → All
Hardware: PowerPC → All
did this code go live?
anything left?
(Assignee)

Updated

10 years ago
Status: NEW → RESOLVED
Last Resolved: 10 years ago
Resolution: --- → FIXED
Product: mozilla.org → Release Engineering
You need to log in before you can comment on or make changes to this bug.