Closed Bug 723107 Opened 8 years ago Closed 8 years ago

replace build/mobile/devicemanager* with the sources at testing/mozbase/mozdevice/mozdevice

Categories

(Testing :: Mozbase, defect)

ARM
Android
defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla18

People

(Reporter: jmaher, Assigned: wlach)

References

Details

Attachments

(1 file, 1 obsolete file)

now that we mirror mozdevice to m-c, we should remove the build/mobile/devicemanager files and update the makefiles to reference the mozdevice files.
a few things to watch out for:
1) ensure we have all changes from the build/mobile/devicemanager* files in the mozdevice location
2) remember to delete the build/mobile files
3) this isn't using mozdevice as a module, more of just the files

this gets the ball rolling.
Assignee: nobody → jmaher
Status: NEW → ASSIGNED
Attachment #593455 - Flags: review?(wlachance)
Comment on attachment 593455 [details] [diff] [review]
fix the makefiles to use mozbase/mozdevice instead of build/mobile (1.0)

hmm, we don't want to use testing/mozbase/mozdevice
Attachment #593455 - Flags: review?(wlachance)
Status: ASSIGNED → RESOLVED
Closed: 8 years ago
Resolution: --- → WONTFIX
[ CCing a whole bunch of people who this bug might affect ]

Ok, I'm going to suggest that experience has shown our decision here to be wrong. It would be much more natural if we stored it in `testing/mozbase`, as jmaher's patch initially proposed:

1. Eventually we could move towards making in-tree code import mozdevice, which will make it easier to move code into or out of m-c (see bug 789305 for an example of where this might be useful).
2. It would inform developers/interested parties about mozdevice (which we want to steer them to using as opposed to manually copying files from m-c)
3. It will make mirroring between the two repositories somewhat more natural. When updating mozbase, the process will now be to simply restore the mozdevice files to their pristine state when merging, rather than deleting the repository entirely. For the opposite case, it should be fairly easily to get an actual set of patches that have landed since the last merge with mozbase (which can be modified to apply there by subsituting `testing/mozbase/mozdevice` with `/mozdevice`.

Note that I am not proposing a change in the policy of the "canonical" location for mozdevice, which will still be in m-c. Changes should land there first, then be mirrored to our github repository (ideally on a patch-by-patch basis, as I suggest above).

I have a patch to make this work, which I'll run through try.
Assignee: jmaher → nobody
Status: RESOLVED → REOPENED
Component: General → Mozbase
Resolution: WONTFIX → ---
Assignee: nobody → wlachance
Attachment #593455 - Attachment is obsolete: true
Attachment #659264 - Flags: review?(jmaher)
(In reply to William Lachance (:wlach) from comment #4)
> Created attachment 659264 [details] [diff] [review]
> Re-add mozdevice to testing/mozbase, remove duplicate files in build/mobile

Note that I removed devicemanager-utils.py, as it's not used by anything and its functionality has been superceded by the sut client in mozdevice.
(In reply to William Lachance (:wlach) from comment #4)
> Created attachment 659264 [details] [diff] [review]
> Re-add mozdevice to testing/mozbase, remove duplicate files in build/mobile

Pushed to try: https://tbpl.mozilla.org/?tree=Try&rev=969495b5e587
We probably should communicate to dev-$something if we land this.  I'm not sure who all knows/cares about the m-c mozdevice files, but I know there's an audience.
Try run for 969495b5e587 is complete.
Detailed breakdown of the results available here:
    https://tbpl.mozilla.org/?tree=Try&rev=969495b5e587
Results (out of 19 total builds):
    success: 18
    failure: 1
Builds (or logs if builds failed) available at:
http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/wlachance@mozilla.com-969495b5e587
Comment on attachment 659264 [details] [diff] [review]
Re-add mozdevice to testing/mozbase, remove duplicate files in build/mobile

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

why is 'testing/mozbase/mozdevice/tests/manifest.ini', included it is blank and it doesn't show up when I apply this patch to my tree.  Also devicemanager-utils.py is being added to mozdevice, that seems wrong.
Attachment #659264 - Flags: review?(jmaher) → review+
Inbound: https://hg.mozilla.org/integration/mozilla-inbound/rev/3b8756765ff5

(In reply to Joel Maher (:jmaher) from comment #9)
> Comment on attachment 659264 [details] [diff] [review]
> Re-add mozdevice to testing/mozbase, remove duplicate files in build/mobile
> 
> Review of attachment 659264 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> why is 'testing/mozbase/mozdevice/tests/manifest.ini', included it is blank
> and it doesn't show up when I apply this patch to my tree.  

Not sure what happened there. It looks fine on inbound, albeit it is only one line (https://hg.mozilla.org/integration/mozilla-inbound/file/3b8756765ff5/testing/mozbase/mozdevice/tests/manifest.ini)

> Also
> devicemanager-utils.py is being added to mozdevice, that seems wrong.

Quite right.
(In reply to Jeff Hammel [:jhammel] from comment #7)
> We probably should communicate to dev-$something if we land this.  I'm not
> sure who all knows/cares about the m-c mozdevice files, but I know there's
> an audience.

Yeah, I'll definitely do a heads on on m.d.platform, m.d.p.mobile, and m.tools as soon as this land in central. I'll also do some doc updates on merging mozbase, etc.
https://hg.mozilla.org/mozilla-central/rev/3b8756765ff5
Status: REOPENED → RESOLVED
Closed: 8 years ago8 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla18
You need to log in before you can comment on or make changes to this bug.