640943 - post_upload.py should support a config file for host specific values

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P2)

Description

[Chris AtLee [:catlee]]

right now post_upload.py has 2 or 3 sections at the top that need commenting out depending on what environment you're running it in. This makes deploying new versions hard and error prone on stage and preproduction.

post_upload.py should support a config file to load the relevant paths from, or to indicate if it should use the production, stage, or preproduction paths.

Comment 2

[John Ford [:jhford] CET/CEST Berlin Time]

someone didn't patch their tools correctly which caused this to bite me.  I'm working on a fix, will take bug when I think my patch is done

Comment 3

[John Ford [:jhford] CET/CEST Berlin Time]

Attachment: tools v1

Testing this in staging is a bit of a pain, so I want to make sure the approach is acceptable

Comment 4

[John Ford [:jhford] CET/CEST Berlin Time]

Attachment: puppet-manifests v1

I am not too familiar with master-puppet stuff, so I don't know if there is a production vs staging variable that I could use for the symlink.  If there isn't, is it OK to bake in the staging string?

Comment 5

[Chris AtLee [:catlee]]

Comment on attachment 611619 [details] [diff] [review]
puppet-manifests v1

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

So I have mixed feelings about this...post_upload is run by several users, and I think the settings are almost all host-specific. So maybe it makes sense to put postupload.ini in /etc?

Comment 6

[Chris AtLee [:catlee]]

Comment on attachment 611617 [details] [diff] [review]
tools v1

looks great!

Comment 7

[John Ford [:jhford] CET/CEST Berlin Time]

(In reply to Chris AtLee [:catlee] from comment #5)
> Comment on attachment 611619 [details] [diff] [review]
> puppet-manifests v1
> 
> Review of attachment 611619 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> So I have mixed feelings about this...post_upload is run by several users,
> and I think the settings are almost all host-specific. So maybe it makes
> sense to put postupload.ini in /etc?

Thinking about it again, yeah, everything that is user-specific is taken care of by using string formatters in the variables.

Comment 8

[John Ford [:jhford] CET/CEST Berlin Time]

The remaining work here is to address Catlee's concerns from comment 5, which shouldn't be difficult and deploy it.  I've never done a post_upload.py deployment, so I am unsure what's needed here.

Comment 9

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

Using /etc sounds good to me. Deploying changes is documented at 
 https://wiki.mozilla.org/ReleaseEngineering/How_To/Modify_scripts_on_stage

Comment 10

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

ping from mtg w/Jesse, who is asking me about bug#751878. Any ETA?

Comment 11

[Chris Cooper [:coop] (he/him)]

Nope, kinda underwater with relops and the Thunderbird release right now, sorry.

Comment 12

[Chris Cooper [:coop] (he/him)]

(In reply to John Ford [:jhford] from comment #8)
> The remaining work here is to address Catlee's concerns from comment 5,
> which shouldn't be difficult and deploy it.  I've never done a
> post_upload.py deployment, so I am unsure what's needed here.

By "deploy" I'm going to infer "test and then deploy." Once bitten and all.

AFAICT the only changes that need to happen are adding an ini file for preproduction, and fixing up the puppet manifest.

Comment 13

[Chris Cooper [:coop] (he/him)]

I've patched the version of post_upload.py that's running on dev-stage01 and symlinked an updated version of staging.ini (with scl3 changes) as /etc/post_upload.ini.

Working on a doing the same for preproduction now.

Comment 14

[Chris Cooper [:coop] (he/him)]

(In reply to Chris Cooper [:coop] from comment #13)
> Working on a doing the same for preproduction now.

Preproduction is setup now too.

Comment 15

[Chris Cooper [:coop] (he/him)]

Attachment: Use ini file for post_upload_py local config

post_upload.py isn't changed from jhford's patch, I've just added a new config for preproduction and fixed paths to point to new hosts in scl3 where applicable.

Comment 16

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

Comment on attachment 635069 [details] [diff] [review]
Use ini file for post_upload_py local config

Drive by ...

>diff --git a/stage/staging.ini b/stage/staging.ini
>+[urls]
>+tinderbox_builds = http://dev-stage01.build.sjc1.mozilla.com/pub/mozilla.org/%(product)s/tinderbox-builds/%(tinderbox_builds_dir)s
>+long_dated = http://dev-stage01.build.sjc1.mozilla.com/pub/mozilla.org/%(product)s/%(nightly_dir)s/%(year)s/%(month)s/%(year)s-%(month)s-%(day)s-%(hour)s-%(minute)s-%(second)s-%(branch)s
>+candidates = http://dev-stage01.build.sjc1.mozilla.com/pub/mozilla.org/%(product)s/%(nightly_dir)s/%(version)s-candidates/build%(buildnumber)s
>+pvt_builds = https://dm-pvtbuild01.mozilla.org/staging/%(product)s/%(tinderbox_builds_dir)s
>+try = http://dev-stage01.build.sjc1.mozilla.com/pub/mozilla.org/%(product)s/try-builds/%(who)s-%(revision)s/%(builddir)s

s/dev-stage01-build.sjc1/dev-stage01.srv.releng.scl3/g

I'm not sure what to do about pvt_builds - the hostname for prod is pvtbuilds2.dmz.scl3.mozilla.com. Are we going to use the production config there ? At any rate the old host is still in all three ini files.

Comment 17

[Chris Cooper [:coop] (he/him)]

Attachment: Use ini file for post_upload_py local config, v2

(In reply to Nick Thomas [:nthomas] from comment #16) 
> s/dev-stage01-build.sjc1/dev-stage01.srv.releng.scl3/g

Sigh. I took my patch from preproduction-stage after handing dev-stage01 over to jhopkins, and of course I forgot to move this change over. Updated patch attached.

> I'm not sure what to do about pvt_builds - the hostname for prod is
> pvtbuilds2.dmz.scl3.mozilla.com. Are we going to use the production config
> there ? At any rate the old host is still in all three ini files.

Good catch. pvt-builds for preproduction was previously pointing to preproduction-stage so I've honored that. Staging pvt-builds had always been pointing to the production location AFAICT.

Comment 18

[Chris Cooper [:coop] (he/him)]

Comment on attachment 635156 [details] [diff] [review]
Use ini file for post_upload_py local config, v2

https://hg.mozilla.org/build/tools/rev/2ad3ab02af12

Comment 19

[Chris Cooper [:coop] (he/him)]

Comment on attachment 635156 [details] [diff] [review]
Use ini file for post_upload_py local config, v2

svn ci -m"Bug 640943 - Use ini file for post_upload_py local config - r=catlee" 
Sending        files/bin/post_upload.py
Adding         files/etc/post_upload.ini
Sending        manifests/post-upload.pp
Transmitting file data ...
Committed revision 41376.

Now deployed in production and preproduction.

Comment 20

[Chris Cooper [:coop] (he/him)]

Just checked on stage.m.o and this is officially deployed now.

Comment 21

[Justin Wood (:Callek)]

....i think this broke seamonkey, at least releases. Cc ewong for a look before i can

Comment 22

[Edmund Wong (:ewong)]

(In reply to Justin Wood (:Callek) from comment #21)
> ....i think this broke seamonkey, at least releases. Cc ewong for a look
> before i can

could another possible reason for the breakage be the patch for bug #725839?

Comment 23

[Justin Wood (:Callek)]

(In reply to Edmund Wong (:ewong) from comment #22)
> (In reply to Justin Wood (:Callek) from comment #21)
> > ....i think this broke seamonkey, at least releases. Cc ewong for a look
> > before i can
> 
> could another possible reason for the breakage be the patch for bug #725839?

Yep thats it (sorry for noise here)