639838 - Setup preproduction release master

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P2)

Comment 1

[Rail Aliiev [:rail]]

Attachment: [WIP] pre-production release master config

Comment 2

[Rail Aliiev [:rail]]

Attachment: pre-production release master config

Comment 3

[Rail Aliiev [:rail]]

Attachment: builbotcustom changes for pre-production release master

Notice checks for sr.get('clonePath') and releaseConfig.get('l10nRepoClonePath') added to make test-masters.sh happy. 

I'm going to use production release configs for pre-production release. Pre-production release config bumper will add missing variables and bump the configs.

Comment 4

[Rail Aliiev [:rail]]

Ben suggested to get rid of "if staging" logic and move it to configs.

Comment 5

[Rail Aliiev [:rail]]

Attachment: tools

Comment 6

[Rail Aliiev [:rail]]

Attachment: buildbotcustom

Comment 7

[Rail Aliiev [:rail]]

Attachment: configs

Comment 8

[Rail Aliiev [:rail]]

Some notes:

* staging_release-*.py files will be linked to release-*.py in master dirs
* getParentDirAndFile (any better name?) resolves the links
* preproduction bits are not added yet

Comment 9

[[e-mail] (:bhearsum)]

Comment on attachment 519647 [details] [diff] [review]
buildbotcustom

I like you method for getting the right config file. Any idea how to deal with it in a client side script? I don't think we have to deal with that yet, but it would be good to know for when we do.

Looks fine to me overall.

Comment 10

[[e-mail] (:bhearsum)]

Comment on attachment 519646 [details] [diff] [review]
tools

Can we rename getParentDirandFile to getAbspath? Can you write tests for it?

Comment 11

[[e-mail] (:bhearsum)]

Comment on attachment 519648 [details] [diff] [review]
configs

I think messagePrefix, commitPatcherConfig, and enable_repo_setup belong in the release configs rather than the branch ones. Looks fine otherwise

Comment 12

[Chris AtLee [:catlee]]

Comment on attachment 519646 [details] [diff] [review]
tools

>diff --git a/lib/python/build/paths.py b/lib/python/build/paths.py
>index 3e6c760..fc57c76 100644
>--- a/lib/python/build/paths.py
>+++ b/lib/python/build/paths.py
>@@ -1,3 +1,6 @@
>+from os import path, getcwd
>+
>+
> def getLatestDir(product, branch, platform, nightlyDir="nightly",
>                  protocol=None, server=None):
>     if protocol:
>@@ -21,3 +24,19 @@ def getMUSnippetDir(brandName, oldVersion, oldBuildNumber, version,
>     return '%s-%s-build%s-%s-build%s-MU' % (brandName, oldVersion,
>                                             oldBuildNumber, version,
>                                             buildNumber)
>+
>+
>+def getParentDirAndFile(file_name, dir=None):
>+    if not dir:
>+        dir = getcwd()
>+    real_path = path.join(dir, file_name)
>+    # readlink until we hit real path
>+    while True:
>+        try:
>+            real_path = os.readlink(real_path)
>+        except OSError:
>+            break

would os.path.realpath work better here?

>+
>+    real_file_name = path.basename(real_path)
>+    parent_dir = path.split(path.dirname(real_path))[-1]
>+    return path.join(parent_dir, real_file_name)

Comment 13

[Chris AtLee [:catlee]]

Comment on attachment 519646 [details] [diff] [review]
tools

also, some comments about what getParentDirAndFile is supposed to be doing would be handy

Comment 14

[Chris AtLee [:catlee]]

Comment on attachment 519648 [details] [diff] [review]
configs

I don't see the point of getParentDirAndFile, but other than that it looks good.

Comment 15

[Rail Aliiev [:rail]]

> would os.path.realpath work better here?

Yeah, I've switched to it already.

(In reply to comment #14)
> I don't see the point of getParentDirAndFile, but other than that it looks
> good.

The main point is to resolve localconfig.py and pass the real name to slave scritps. Additionally I'm going to symlink staging release config file so that they look like production ones. By using getParentDirAndFile (changed to getRealpath) you'll get their real name to be passed as a property to some builders.

For example, if we have
/buids/buildbot/builder_master1/master/localconfig.py
 which points to
/buids/buildbot/builder_master1/configs/mozilla/production_config.py
(or ../configs/mozilla/production_config.py)
getRealpath will return "mozilla/production_config.py", so you can pass it to consumer functions and builders. The same applies for release configs.

Comment 16

[Rail Aliiev [:rail]]

Attachment: tools

* function renamed to getRealpath
* getRealpath simplified by using os.path.realpath
* added tests

Comment 17

[Rail Aliiev [:rail]]

Attachment: buildbotcustom

message_tag, enable_repo_setup, commitPatcherConfig variables are pulled from branch config, but could be overridden by release config. I chose this method to not bloat release configs and simplify release config file manipulation for pre-production. I can move them to release configs if you prefer.

Comment 18

[Rail Aliiev [:rail]]

Attachment: configs

* added mozilla/preproduction_release_master_localconfig.py config
* updated setup-master.py for the new masters
* preprod-release-master is not printed by setup-master.py -l -8 to make test-masters.sh happy. preprod-release-master doesn't pass checkconfig w/o bumped configs (config bumper also adds some staging specific variables to production configs after bumping the version).

Comment 19

[Rail Aliiev [:rail]]

I tested these patches in staging:

1. branch config file name dumped from misc.py and release.py. Staging setup returns "mozilla/staging_config.py", fresh set up production master returns "mozilla/production_config.py".

2. Message tag. Worked as expected.

3. repo_setup + release_downloader builders are visible only in staging and preproduction.

4. commitPatcherConfig is True in production and False in staging/preproduction.

It's not required to change anything for production masters, all symlinks stay the same. For staging masters we need to add 4 symlinks (staging_firefox*.py -> firefox*.py).

Comment 20

[[e-mail] (:bhearsum)]

Comment on attachment 520635 [details] [diff] [review]
tools

Please note that getcwd() is the default for 'cwd' in the docstring. Looks fine otherwise!

Comment 21

[[e-mail] (:bhearsum)]

Comment on attachment 520637 [details] [diff] [review]
buildbotcustom

I really don't like those three variables in the branch configs at all, even if they're overrideable. I think we *do* need a place to set smart defaults for release configs, but I don't think branch configs are the right place. Until we have that, please put them in the release configs directly.

Comment 22

[[e-mail] (:bhearsum)]

I filed bug 643471 on getting a place to set release config defaults.

Comment 23

[Rail Aliiev [:rail]]

Attachment: tools

Fixed docstring. Carrying over r=bhearsum.

Comment 24

[Rail Aliiev [:rail]]

Attachment: buildbotcustom

Release configs used.

Comment 25

[Rail Aliiev [:rail]]

Attachment: configs

Added releaseConfig['messagePrefix'], releaseConfig['commitPatcherConfig'], releaseConfig['enable_repo_setup'] release config variables.

Comment 26

[Rail Aliiev [:rail]]

Comment on attachment 520683 [details] [diff] [review]
tools

http://hg.mozilla.org/build/tools/rev/37346b9d01d3

Comment 27

[Rail Aliiev [:rail]]

Comment on attachment 520684 [details] [diff] [review]
buildbotcustom

http://hg.mozilla.org/build/buildbotcustom/rev/bf35f0f01232

Comment 28

[Rail Aliiev [:rail]]

Comment on attachment 520687 [details] [diff] [review]
configs

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

Comment 29

[Rail Aliiev [:rail]]

I've updated symlinks on staging masters to reflect changes pushed.

for master in builder_master1 builder_master2 builder_master3 builder_master4 \
    bhearsum/build catlee/master rail ; do
    cd $master
    for v in 1.9.1 1.9.2 2.0 central; do
        rm -v release-firefox-mozilla-$v.py
        ln -sv staging_release-firefox-mozilla-$v.py \
            release-firefox-mozilla-$v.py
    done
    cd -
done

Production masters don't require any changes after merging to production branches.

Comment 30

[Rail Aliiev [:rail]]

It's up, running and being recreated from time to time by preproduction master (every 3 days atm).