Remove backported modules now included in our Salt #492

aneeshusa · 2016-09-27T21:09:23Z

These modules were backported from Salt 2015.8 or Salt 2016.3, but they
should no longer be necessary now that we are on Salt 2016.3.3.

This change is

larsbergstrom · 2016-09-27T21:11:15Z

@bors-servo r+

bors-servo · 2016-09-27T21:11:16Z

📌 Commit 6c88151 has been approved by larsbergstrom

bors-servo · 2016-09-27T21:11:17Z

⌛ Testing commit 6c88151 with merge 53700af...

Remove backported modules now included in our Salt These modules were backported from Salt 2015.8 or Salt 2016.3, but they should no longer be necessary now that we are on Salt 2016.3.3.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/492)

bors-servo · 2016-09-27T21:31:47Z

💔 Test failed - status-travis

larsbergstrom · 2016-09-27T21:33:29Z

Installing and configuring Salt

.travis/install_salt.sh: installing salt for Mac OS X

Already up-to-date.

Unlinking /usr/local/Cellar/saltstack/2016.3.3... 28 symlinks removed

Warning: saltstack-2016.3.3 already installed, it's just not linked

.travis/install_salt.sh: copying Salt minion configuration from .travis

Printing Salt grains for debugging

sudo: salt-call: command not found

The command ".travis/dispatch.sh" exited with 1.

Done. Your build exited with 1.

/Users/travis/build.sh: line 109: shell_session_update: command not found

larsbergstrom · 2016-09-27T21:45:01Z

@bors-servo r+

bors-servo · 2016-09-27T21:45:02Z

📌 Commit 9aa4ad1 has been approved by larsbergstrom

bors-servo · 2016-09-27T21:45:04Z

⌛ Testing commit 9aa4ad1 with merge 5c1d80f...

Remove backported modules now included in our Salt These modules were backported from Salt 2015.8 or Salt 2016.3, but they should no longer be necessary now that we are on Salt 2016.3.3.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/492)

bors-servo · 2016-09-27T22:07:11Z

💔 Test failed - status-travis

aneeshusa · 2016-09-27T23:21:18Z

FYI @larsbergstrom - I've attempted to investigate this on servo-mac1, but it turns out that running those brew commands as servo has thoroughly borked permissions - I chowned everything I could find to administrator but am still getting random brew permission errors that I can't figure out.

I think we may need to re-pave servo-mac1 at the least; while we are doing so, can you also ensure it gets OS X 10.11 and XCode 8 (to match what Travis is testing?)

aneeshusa · 2016-09-28T19:39:50Z

@larsbergstrom we won't be able to merge anything until I figure out what's going on with macOS and this PR is updated/merged; when the Salt upgrade PR went through the previous rev was failing so the upgrade test essentially became another install from scratch, hence the need to fix the upgrade test in this PR.

larsbergstrom · 2016-09-28T20:26:17Z

Should I manually merge things (particularly the builder increase) until then? I don't want you to burn the late-night oil investigating that, but also need to try to address our queue length issues ASAP.

aneeshusa · 2016-09-28T21:14:31Z

As long as everything but the second mac builder succeeds on Travis, I think it's OK to merge manually for now. I do want to investigate the Mac failures though, so it would be helpful if you got the servo-mac1 repave/upgrade to macOS 10.11/XCode 8 started.

larsbergstrom · 2016-09-28T21:15:34Z

I spent last night trying to upgrade to macOS 10.11, but it was a total failure. Macstadium just reimaged the machine and I'm hoping to have it available for you in < 1 hour (aka "before I go pick up the toddler").

larsbergstrom · 2016-09-28T21:36:37Z

Hrm, the app store is downloading xcode (4.4+GB) very slowly, so this may not be available until later this evening. I'll do my best to have it wrapped up tonight and ready for you to play with.

aneeshusa · 2016-09-28T21:45:26Z

Thanks! No need to rush it - I don't have that much free time :) I'll make sure to keep you appraised of updates.

larsbergstrom · 2016-09-29T01:46:18Z

I've set up the machine and landed & deployed the buildbot change so that servo-mac1 will not start doing builds. Salt is running and responds to a test.ping from the servo master BUT a highstate does not seem to go through.

Let me know if you need the admin password for that machine (since we haven't done a first salt run, you can't ssh into it using your pubkey yet).

aneeshusa · 2016-09-29T03:56:43Z

Thanks for getting it set up so quickly! The admin password would be very helpful - Salt can execute commands remotely but it's a bit constraining (although there is a feature request for easy remote shells!). I also will need to be able to su administrator for the brew commands, which IIRC requires an actual shell.

aneeshusa · 2016-09-30T13:39:11Z

I haven't started looking at this yet, but I just found out we can't yet build Servo on XCode 8. Also, apparently Homebrew has reversed course and as of 1.0.4 only requires XCode 8 for Sierra and above.

I think it may be easier to go back to the osx_image: xcode7.3 on Travis, which has Xcode 7.3.1 and OS X 10.11, until we have XCode 8 support in Servo. Thoughts @larsbergstrom ?

aneeshusa · 2016-09-30T16:14:20Z

It looks like using OS X 10.11 + XCode 7.3 works now, at least on Travis. r? @larsbergstrom

These modules were backported from Salt 2015.8 or Salt 2016.3, but they should no longer be necessary now that we are on Salt 2016.3.3.

If the previous version is the same as the new version, then we will unlink Salt, but Homebrew will not relink it when (re-)installing, so make sure to relink manually afterwards.

We need to unlink before relinking or else homebrew complains. Be more strict in the grep for each package to avoid false positives.

Homebrew 1.0.4 (https://github.com/Homebrew/brew/releases/tag/1.0.4) relaxed the XCode 8 requirement to only apply on Sierra on above. Because Servo does not yet build with XCode 8, and our builders and Travis are all using 10.11, we can continue to use XCode 7.3 for now.

larsbergstrom · 2016-09-30T16:22:15Z

@bors-servo r+

bors-servo · 2016-09-30T16:22:16Z

📌 Commit ab3d5f0 has been approved by larsbergstrom

bors-servo · 2016-09-30T16:22:18Z

⌛ Testing commit ab3d5f0 with merge c9f3915...

Remove backported modules now included in our Salt These modules were backported from Salt 2015.8 or Salt 2016.3, but they should no longer be necessary now that we are on Salt 2016.3.3.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/492)

bors-servo · 2016-09-30T16:42:43Z

💔 Test failed - status-travis

aneeshusa · 2016-09-30T16:51:00Z

@bors-servo retry

Died due to a lack of output for 10 minutes, hopefully it's something intermittent.

bors-servo · 2016-09-30T16:51:03Z

⌛ Testing commit ab3d5f0 with merge e5ee208...

Remove backported modules now included in our Salt These modules were backported from Salt 2015.8 or Salt 2016.3, but they should no longer be necessary now that we are on Salt 2016.3.3.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/492)

bors-servo · 2016-09-30T17:04:36Z

☀️ Test successful - status-travis

aneeshusa force-pushed the remove-2016.3-backports branch from b280626 to db0d2ae Compare September 30, 2016 15:47

aneeshusa added 5 commits September 30, 2016 12:14

Remove backported modules now included in our Salt

884ca6f

These modules were backported from Salt 2015.8 or Salt 2016.3, but they should no longer be necessary now that we are on Salt 2016.3.3.

Ensure Salt is linked by Homebrew after install

db005cb

If the previous version is the same as the new version, then we will unlink Salt, but Homebrew will not relink it when (re-)installing, so make sure to relink manually afterwards.

Fix homebrew autoconf install/linking script

d42a394

We need to unlink before relinking or else homebrew complains. Be more strict in the grep for each package to avoid false positives.

Print brew version when installing for debugging

ab3d5f0

aneeshusa force-pushed the remove-2016.3-backports branch from db0d2ae to ab3d5f0 Compare September 30, 2016 16:16

larsbergstrom mentioned this pull request Sep 30, 2016

Split the macOS WPT into two chunks an add another builder #497

Merged

bors-servo merged commit ab3d5f0 into servo:master Sep 30, 2016

aneeshusa mentioned this pull request Sep 30, 2016

Add stylo unit tests to linux-dev #481

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove backported modules now included in our Salt #492

Remove backported modules now included in our Salt #492

aneeshusa commented Sep 27, 2016 •

edited by larsbergstrom

larsbergstrom commented Sep 27, 2016

bors-servo commented Sep 27, 2016

bors-servo commented Sep 27, 2016

bors-servo commented Sep 27, 2016

larsbergstrom commented Sep 27, 2016

larsbergstrom commented Sep 27, 2016

bors-servo commented Sep 27, 2016

bors-servo commented Sep 27, 2016

bors-servo commented Sep 27, 2016

aneeshusa commented Sep 27, 2016

aneeshusa commented Sep 28, 2016

larsbergstrom commented Sep 28, 2016

aneeshusa commented Sep 28, 2016

larsbergstrom commented Sep 28, 2016

larsbergstrom commented Sep 28, 2016

aneeshusa commented Sep 28, 2016

larsbergstrom commented Sep 29, 2016

aneeshusa commented Sep 29, 2016

aneeshusa commented Sep 30, 2016

aneeshusa commented Sep 30, 2016 •

edited

larsbergstrom commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Sep 30, 2016

aneeshusa commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Sep 30, 2016

Remove backported modules now included in our Salt #492

Remove backported modules now included in our Salt #492

Conversation

aneeshusa commented Sep 27, 2016 • edited by larsbergstrom

larsbergstrom commented Sep 27, 2016

bors-servo commented Sep 27, 2016

bors-servo commented Sep 27, 2016

bors-servo commented Sep 27, 2016

larsbergstrom commented Sep 27, 2016

larsbergstrom commented Sep 27, 2016

bors-servo commented Sep 27, 2016

bors-servo commented Sep 27, 2016

bors-servo commented Sep 27, 2016

aneeshusa commented Sep 27, 2016

aneeshusa commented Sep 28, 2016

larsbergstrom commented Sep 28, 2016

aneeshusa commented Sep 28, 2016

larsbergstrom commented Sep 28, 2016

larsbergstrom commented Sep 28, 2016

aneeshusa commented Sep 28, 2016

larsbergstrom commented Sep 29, 2016

aneeshusa commented Sep 29, 2016

aneeshusa commented Sep 30, 2016

aneeshusa commented Sep 30, 2016 • edited

larsbergstrom commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Sep 30, 2016

aneeshusa commented Sep 30, 2016

bors-servo commented Sep 30, 2016

bors-servo commented Sep 30, 2016

aneeshusa commented Sep 27, 2016 •

edited by larsbergstrom

aneeshusa commented Sep 30, 2016 •

edited