831788 - gaia-central and gaia nightly b2g builds should upload to different locations

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P1)

Description

[Armen [:armenzg]]

Currently they both upload to "-panda".

This requires fixing in here:
http://hg.mozilla.org/build/mozharness/file/default/scripts/b2g_build.py#l801

Comment 1

[Aki Sasaki (not active)]

Maybe upload_path = gecko_config.get('upload_path', "%(basepath)s/%(user)s-%(rev)s/%(branch)s-%(target)s" % dict( ...

?

Comment 2

[Armen [:armenzg]]

Attachment: b2g upload

I was trying this.

Comment 3

[Armen [:armenzg]]

Attachment: b2g panda builds uploaded to different locations

Upload locations:
http://pvtbuilds.pvt.build.mozilla.org/pub/mozilla.org/b2g/tinderbox-builds/ash-panda/20130121064520/
http://pvtbuilds.pvt.build.mozilla.org/pub/mozilla.org/b2g/tinderbox-builds/ash-panda_gaia_central/20130121064520/

I will test all builds as well just in case:
https://tbpl.mozilla.org/?tree=Ash&rev=425835f6a9e2

Comment 4

[Aki Sasaki (not active)]

(In reply to Armen Zambrano G. [:armenzg] from comment #3)
> I will test all builds as well just in case:
> https://tbpl.mozilla.org/?tree=Ash&rev=425835f6a9e2

Hah, you pushed a DONTBUILD rev :)

Comment 5

[Aki Sasaki (not active)]

Comment on attachment 704685 [details] [diff] [review]
b2g panda builds uploaded to different locations

Maybe instead of calling it 'platform', full_platform or platform_name or something, since we're appending to it?

Also, actual testing would make me happy here.

Comment 6

[Armen [:armenzg]]

Lucky me! :)
Trying with https://tbpl.mozilla.org/?tree=Ash&rev=e9f39220b8e7

Comment 7

[Armen [:armenzg]]

I will take platform_name.

It worked:
http://pvtbuilds2.dmz.scl3.mozilla.com//pub/mozilla.org/b2g/tinderbox-builds/ash-panda/20130123062657
http://pvtbuilds2.dmz.scl3.mozilla.com//pub/mozilla.org/b2g/tinderbox-builds/ash-panda_gaia_central/20130123062657

Comment 8

[Armen [:armenzg]]

Builds and tests on Cedar look fine after this change.

Comment 9

[Chris AtLee [:catlee]]

I think this changed the path for unagi builds on mozilla-b2g18 from 

https://pvtbuilds.mozilla.org/pub/mozilla.org/b2g/nightly/mozilla-b2g18-unagi_betatest/
to
https://pvtbuilds.mozilla.org/pub/mozilla.org/b2g/nightly/mozilla-b2g18-unagi_stable_betatest/

was that expected?

Comment 10

[Aki Sasaki (not active)]

Not expected but not entirely surprising either.
Is that breaking anything?

Comment 11

[Armen [:armenzg]]

Comment on attachment 704685 [details] [diff] [review]
b2g panda builds uploaded to different locations

Backed out: http://hg.mozilla.org/build/mozharness/rev/113656bc205b

Comment 12

[Aki Sasaki (not active)]

As mentioned in IRC, instead of automatically appending target suffix, we can .get("upload_platform") or something currently nonexistent, and create that key for panda-gaia-central.

Comment 13

[Armen [:armenzg]]

Attachment: m-c - add upload_platform to b2g/config/panda-gaia-central.json

Comment 14

[Armen [:armenzg]]

Attachment: take upload_platform into consideration if specified on the config.json for such target

Testing on Ash:
https://tbpl.mozilla.org/?tree=Ash&rev=13c688b34570

https://hg.mozilla.org/projects/ash/rev/13c688b34570
http://hg.mozilla.org/users/asasaki_mozilla.com/ash-mozharness/rev/0718dc9db809

Comment 15

[Armen [:armenzg]]

I had to re-trigger the panda jobs because I did not merge to production.
I will re-trigger the emulator and unagi jobs to make sure it works.

http://pvtbuilds.pvt.build.mozilla.org/pub/mozilla.org/b2g/tinderbox-builds/ash-panda/20130129073153/
http://pvtbuilds.pvt.build.mozilla.org/pub/mozilla.org/b2g/tinderbox-builds/ash-panda_gaia_central/20130129073153/

Comment 16

[Armen [:armenzg]]

The remaining upload paths are working:
http://ftp.mozilla.org/pub/mozilla.org/b2g/tinderbox-builds/ash-ics_armv7a_gecko/1359473513
http://ftp.mozilla.org/pub/mozilla.org/b2g/tinderbox-builds/ash-ics_armv7a_gecko-debug/1359473513

Unagi builds don't upload.

Comment 17

[Aki Sasaki (not active)]

Comment on attachment 707631 [details] [diff] [review]
m-c - add upload_platform to b2g/config/panda-gaia-central.json

This'll have to land in all branches where we build panda_gaia_central.

Comment 18

[Aki Sasaki (not active)]

Comment on attachment 707632 [details] [diff] [review]
take upload_platform into consideration if specified on the config.json for such target

This could be

target = self.load_gecko_config().get('upload_platform', self.config['target'])

This is fine, though.

Glad to see some smaller patches from you :)

Comment 19

[Armen [:armenzg]]

Comment on attachment 707631 [details] [diff] [review]
m-c - add upload_platform to b2g/config/panda-gaia-central.json

http://hg.mozilla.org/integration/mozilla-inbound/rev/fd83646a2d15

Comment 20

[Armen [:armenzg]]

Comment on attachment 707632 [details] [diff] [review]
take upload_platform into consideration if specified on the config.json for such target

I like your suggestion. I've taken it.

Comment 21

[Armen [:armenzg]]

I will leave this open until we merge mozharness to production and land the patch on all relevant b2g branches.

Comment 22

[Armen [:armenzg]]

I assume I need to land it to Mozilla-B2g18 and Mozilla-B2g18_v1_0_0.
All other branches will be able to get fixed once pulling from m-c.

Comment 23

[Armen [:armenzg]]

Comment on attachment 707631 [details] [diff] [review]
m-c - add upload_platform to b2g/config/panda-gaia-central.json

[Approval Request Comment]

Currently we create two b2g builds for the panda boards.
One based off gaia nightly and the other from gaia central.
We currently upload both to the same location and overwrite each other.

This patch will allow to specify a different upload location for the gaia central job.

I need to land this on mozilla-b2g18 and mozilla-b2g18_v1_0_0.

Any other branches besides those two?

Comment 24

[Aki Sasaki (not active)]

Comment on attachment 707632 [details] [diff] [review]
take upload_platform into consideration if specified on the config.json for such target

Merged to production.
Should be noop until upload_platform is specified in-tree.

Comment 25

[Armen [:armenzg]]

It is working on inbound:
http://pvtbuilds.pvt.build.mozilla.org//pub/mozilla.org/b2g/tinderbox-builds/mozilla-inbound-panda
http://pvtbuilds.pvt.build.mozilla.org//pub/mozilla.org/b2g/tinderbox-builds/mozilla-inbound-panda_gaia_central

Comment 26

[Armen [:armenzg]]

https://hg.mozilla.org/releases/mozilla-b2g18/rev/57ac7f8d6db0
https://hg.mozilla.org/releases/mozilla-b2g18_v1_0_0/rev/61de17fa9289

Comment 27

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/fd83646a2d15