755989 - setup-master.py doesn't set up staging symlinks properly

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P2)

Description

[Rail Aliiev [:rail]]

Attachment: setup-master.py fixed

If you set up a dev master, release-*-*.py files should point to staging_release-*-*.py files because release.py has no idea about which environment it's in dev or prod.

We used to use mozilla_staging with local_links magic, but recently it was removed and I had to use a json file to set up a dev master. load_masters_json() doesn't handle staging case properly.

Attached patch fixes the problem, no more [release] emails from staging. :/

It also fixes filter_masters() function which looks broken to me.

Comment 1

[Aki Sasaki (not active)]

Comment on attachment 624633 [details] [diff] [review]
setup-master.py fixed

>+                    [('staging_release-fennec-mozilla-%s.py' % v,
>+                      'release-fennec-mozilla-%s.py' % v)
>+                      for v in ['beta', 'release']
>+                    ] +

There are aurora and esr10 staging_release-fennec config files, but I'm not sure who cares about them other than me :)

>-debsign = MasterConfig(

Yay!
I was just thinking about cleaning this up.

Lgtm.
r=me with or without the aurora+esr10 fennec staging files.

Comment 2

[Rail Aliiev [:rail]]

Comment on attachment 624633 [details] [diff] [review]
setup-master.py fixed

http://hg.mozilla.org/build/buildbot-configs/rev/cc1678278763

(In reply to Aki Sasaki [:aki] from comment #1)
> r=me with or without the aurora+esr10 fennec staging files.

I did that on purpose with hope that both of those will be gone soon!

Comment 3

[Mike Taylor [:bear]]

in production 2012-05-17 0750 PDT