1376392 - mozboot: ensure_stylo_packages fails in stand-alone bootstrap

Status: RESOLVED FIXED

(Firefox Build System :: General, defect, P2)

Description

[Ralph Giles (:rillian)]

I tried bootstrapping directly from python/mozboot/bin/bootstrap.py a a fresh machine today and it seems we're failing to find the correct mach to install libclang for stylo:

Traceback (most recent call last):
  File "/Users/mozilla/Downloads/bootstrap.py", line 170, in <module>
    sys.exit(main(sys.argv))
  File "/Users/mozilla/Downloads/bootstrap.py", line 161, in main
    dasboot.bootstrap()
  File "/var/folders/js/1gxgwh1s2qnglt201d39b2wh0000gn/T/tmpOK35gA/mozboot/bootstrap.py", line 341, in bootstrap
    
  File "/var/folders/js/1gxgwh1s2qnglt201d39b2wh0000gn/T/tmpOK35gA/mozboot/osx.py", line 526, in ensure_stylo_packages
  File "/var/folders/js/1gxgwh1s2qnglt201d39b2wh0000gn/T/tmpOK35gA/mozboot/base.py", line 280, in install_tooltool_clang_package
ValueError: mach not found at /Users/mozilla/.config/nvim/mach

Comment 1

[Ralph Giles (:rillian)]

The issue turns out to be I invoked bootstrap.py in `/.config/nvim, which is a dotfile directory under version control. We assume we have an m-c checkout if there's a .git directory present, and then decide to invoke mach.

So definitely a corner case, but it seems like something which could happen to other people. We could check for some well-known files in the top-level directory as a better heuristic.

Comment 2

[Nathan Froyd [:froydnj]]

Attachment: do a more thorough check for git checkouts of mozilla-central in bootstrap

When determining the path of a possible mozilla-central checkout,
bootstrap currently considers the existence of a `.git` directory as
sufficient proof that the containing directory is a git checkout.
Unfortunately, if you happen to execute standalone bootstrap from a git
checkout of something else, you're gonna have a bad time.

To prevent this, check for the existence of a moz.configure file.  This
is not an ideal proof, but it is better than what we currently have.

Comment 3

[Mike Hommey [:glandium]]

Why not just check that the bootstrap.py path is python/mozboot/mozboot/bootstrap.py in that directory that contains a .git? (same for .hg, btw)

Comment 4

[Nathan Froyd [:froydnj]]

(In reply to Mike Hommey [:glandium] from comment #3)
> Why not just check that the bootstrap.py path is
> python/mozboot/mozboot/bootstrap.py in that directory that contains a .git?
> (same for .hg, btw)

We talked about using the bootstrap file.  I am ambivalent to the exact file being used.

Comment 5

[Ralph Giles (:rillian)]

Comment on attachment 8882419 [details] [diff] [review]
do a more thorough check for git checkouts of mozilla-central in bootstrap

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

r=me with issues addressed.

::: python/mozboot/mozboot/bootstrap.py
@@ +297,5 @@
>                  dest = os.path.expanduser(dest)
>                  have_clone = clone_firefox(self.instance.which('hg'), dest)
>                  checkout_root = dest
>  
> +        have_clone=True

This looks spurious?

@@ +472,3 @@
>          elif os.path.exists(git_dir):
> +            moz_configure = os.path.join(path, 'moz.configure')
> +

Remove the blank line here.

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/0dd4dc37770d
do a more thorough check for git checkouts of mozilla-central in bootstrap; r=rillian

Comment 7

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/0dd4dc37770d