972835 - use tbirdbld account to submit thunderbird data to balrog

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[[e-mail] (:bhearsum)]

We're currently submitting with ffxbld, which only works because of bug 749297. We need to switch to tbirdbld before we can land the fix for that.

Comment 1

[[e-mail] (:bhearsum)]

Attachment: add balrog_credentials to BuildSlaves.py

We'll need to do the necessary change to BuildSlaves.py in two parts. This one adds the new place we'll look up credentials in, and once the things that depend on balrog_username/password are changed, I'll remove those from BuildSlaves.py.

Comment 2

[[e-mail] (:bhearsum)]

Comment on attachment 8376416 [details] [diff] [review]
add balrog_credentials to BuildSlaves.py

This patch has been landed, and I'm updating hiera. I've also given stage-tbirdbld permissions to Thunderbird on dev, and tbirdbld permissions to Thunderbird on prod. I'm currently testing Buildbot patches that will swich us to product-specific balrog usernames.

Comment 3

[[e-mail] (:bhearsum)]

Attachment: pass username key to balrog submitter

Comment 4

[[e-mail] (:bhearsum)]

Attachment: pass the username everywhere

Comment 5

[[e-mail] (:bhearsum)]

Attachment: set balrog_username in configs

I tested these patches with a few different build types on my dev-master:
* Linux mozilla-central nightly
* Thunderbird Linux comm-central nightly
* Firefox mozilla-beta release build

Comment 6

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 8382395 [details] [diff] [review]
set balrog_username in configs

Review of attachment 8382395 [details] [diff] [review]:
-----------------------------------------------------------------

::: mozilla/thunderbird_staging_config.py
@@ +4,5 @@
>      'staging': True,
>      'config_repo_path': 'build/buildbot-configs',
>      'buildbotcustom_repo_path': 'build/buildbotcustom',
>      'stage_server': 'dev-stage01.srv.releng.scl3.mozilla.com',
> +    'balrog_username': 'stage-tbirdbld',

Looks like we never set set balrog_api_root for t'bird staging, because GLOBAL_VARS is defined here rather than imported from staging_config.py and updated.

Comment 7

[[e-mail] (:bhearsum)]

(In reply to Nick Thomas [:nthomas] from comment #6)
> Comment on attachment 8382395 [details] [diff] [review]
> set balrog_username in configs
> 
> Review of attachment 8382395 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: mozilla/thunderbird_staging_config.py
> @@ +4,5 @@
> >      'staging': True,
> >      'config_repo_path': 'build/buildbot-configs',
> >      'buildbotcustom_repo_path': 'build/buildbotcustom',
> >      'stage_server': 'dev-stage01.srv.releng.scl3.mozilla.com',
> > +    'balrog_username': 'stage-tbirdbld',
> 
> Looks like we never set set balrog_api_root for t'bird staging, because
> GLOBAL_VARS is defined here rather than imported from staging_config.py and
> updated.

Hm, if this were true my staging build would've failed. I think it works fine because we overwrite GLOBAL_VARS and then update it against thunderbird_localconfig in thunderbird_config.py: https://github.com/mozilla/build-buildbot-configs/blob/master/mozilla/thunderbird_config.py#L21. Rather confusing for the production case.

Comment 8

[[e-mail] (:bhearsum)]

Comment on attachment 8382391 [details] [diff] [review]
pass username key to balrog submitter

I landed this with a default of "ffxbld" for username - because I realized I would've had to sync up the landings otherwise....

Comment 9

[Jordan Lund (:jlund)]

buildbot-configs patch is merged and live in production! :)

Comment 10

[Jordan Lund (:jlund)]

buildbotcustom patch is merged and live in production! :)

Comment 11

[[e-mail] (:bhearsum)]

I see data being submitted at tbirdbld and ffxbld:
python /builds/slave/tb-c-cen-lx-ntly-0000000000000/tools/buildfarm/utils/retry.py -s 1 -r 5 -t 1260 python /builds/slave/tb-c-cen-lx-ntly-0000000000000/tools/scripts/updates/balrog-submitter.py --build-properties buildprops_balrog.json --api-root https://aus4-admin.mozilla.org --username tbirdbld -t nightly --verbose --credentials-file BuildSlaves.py

python /builds/slave/m-cen-lx-ntly-0000000000000000/tools/buildfarm/utils/retry.py -s 1 -r 5 -t 1260 python /builds/slave/m-cen-lx-ntly-0000000000000000/tools/scripts/updates/balrog-submitter.py --build-properties buildprops_balrog.json --api-root https://aus4-admin.mozilla.org --username ffxbld -t nightly --verbose --credentials-file BuildSlaves.py

And updates are still returning the latest data:
https://aus4.mozilla.org/update/3/Thunderbird/27.0a1/20130922030201/Darwin_x86_64-gcc3-u-i386-x86_64/en-US/nightly/Darwin%2012.5.0/default/default/update.xml?force=1
https://aus4.mozilla.org/update/3/Firefox/14.0a1/20120222174716/Darwin_x86-gcc3-u-i386-x86_64/en-US/nightly/Darwin/default/default/update.xml

All done here now!