613212 - release_sanity.py needs to be updated after multi branch masters, tagging landings

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[[e-mail] (:bhearsum)]

I couldn't get it working because the release config loading is busted since the multi branch master landing.

It also needs its sendchange updated -- we now require --revision to be set (to the release tag) as well as setting the release_config property to the path to the release config, relative to the buildbot-configs root. As an example, this is what I used to kick off my 3.6.13 staging run:
buildbot sendchange --username=bhearsum --branch=users/bhearsum_mozilla.com/mozilla-1.9.2 --revision FIREFOX_3_6_13_RELEASE -m " " --master localhost:9018 -p release_config:mozilla/staging_release-firefox-mozilla-1.9.2.py abc

Comment 1

[Shyam Mani [:fox2mike]]

/me sends some <3 to Ben

Comment 2

[Syed Albiz [:salbiz]]

Attachment: add --revision, fix release imports

Tests out in staging, pulling in the correct release_config and passing in the --revision as $(baseTag)_RELEASE in the sendchange.
(Note: --branch|-B option is now required)

Tested with:
/tools/buildbot-0.8.2/bin/python tools/buildbot-helpers/release_sanity.py -s -B mozilla-1.9.2 localhost:9011

Comment 3

[[e-mail] (:bhearsum)]

Comment on attachment 491549 [details] [diff] [review]
add --revision, fix release imports

Looks good! I'll land it.

Comment 4

[[e-mail] (:bhearsum)]

Comment on attachment 491549 [details] [diff] [review]
add --revision, fix release imports

Landed as:  changeset:   1272:71e8b44adceb

Comment 5

[[e-mail] (:bhearsum)]

Thanks for getting to this so quickly Syed!

Comment 6

[Syed Albiz [:salbiz]]

Attachment: add release_config property to sendchange

Original patch did not add the release_config property to the sendchange

Comment 7

[[e-mail] (:bhearsum)]

Comment on attachment 491627 [details] [diff] [review]
add release_config property to sendchange

D'oh

Comment 8

[[e-mail] (:bhearsum)]

Comment on attachment 491549 [details] [diff] [review]
add --revision, fix release imports

(This one isn't obsolete, since it was checked in)

Comment 9

[[e-mail] (:bhearsum)]

Comment on attachment 491627 [details] [diff] [review]
add release_config property to sendchange

changeset:   1273:42c22375809d

Comment 10

[Syed Albiz [:salbiz]]

Attachment: drop checking branch name against release_config

Since mozilla-2.0 release config uses mozilla-central in the releaseConfig branch name, checking the branch name from the configs can't be verified against the branch name passed in as an argument. Dropping that check.

Comment 11

[[e-mail] (:bhearsum)]

Comment on attachment 491641 [details] [diff] [review]
drop checking branch name against release_config

changeset:   1274:b2e0a1975bda

Comment 12

[Syed Albiz [:salbiz]]

No new problems hit in staging, looks like we've caught all the corner cases now.

Comment 13

[[e-mail] (:bhearsum)]

I'm hitting an issue in production now:
[cltbld@production-master03 builder_master]$ PYTHONPATH=.:tools/lib/python python tools/buildbot-helpers/release_sanity.py -u bhearsum -V 3.6.13 --branch mozilla-1.9.2 --build-number 1 --dryrun localhost:9010
2010-11-22 04:05:00,746 : INFO : Comparing tagged revision http://hg.mozilla.org/build/buildbot-configs/raw-file/FIREFOX_3_6_13_BUILD1/mozilla/release-firefox-mozilla-1.9.2.py to on-disk release_config.py ...
Traceback (most recent call last):
  File "tools/buildbot-helpers/release_sanity.py", line 211, in <module>
    releaseConfig['l10nRevisionFile'],
  File "tools/buildbot-helpers/release_sanity.py", line 120, in verify_configs
    if not compare(official_configs, 'release_config.py'):
  File "/builds/buildbot/builder_master/tools/lib/python/util/file.py", line 12, in compare
    file2 = open(file2, 'r', True)
IOError: [Errno 2] No such file or directory: 'release_config.py'

Comment 14

[Syed Albiz [:salbiz]]

Attachment: read in correct release config when verifying config files

Slipped through in staging runs and testing since the release_config.py still existed there, but since it never existed on production masters, the error occurred.

Comment 15

[[e-mail] (:bhearsum)]

Comment on attachment 492315 [details] [diff] [review]
read in correct release config when verifying config files

Did this only work in staging because of the fluke of having the release_config.py symlink still?

Comment 16

[Syed Albiz [:salbiz]]

(In reply to comment #15)
> Comment on attachment 492315 [details] [diff] [review]
> read in correct release config when verifying config files
> 
> Did this only work in staging because of the fluke of having the
> release_config.py symlink still?

Yes, Exactly right.

Comment 17

[[e-mail] (:bhearsum)]

Comment on attachment 492315 [details] [diff] [review]
read in correct release config when verifying config files

changeset:   1303:3379198fb5af

Comment 18

[[e-mail] (:bhearsum)]

Should be OK now. Let's file new bugs if other issues come up.