Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import module for missing user requirement. #782

Merged
merged 1 commit into from Jan 27, 2018
Merged

Import module for missing user requirement. #782

merged 1 commit into from Jan 27, 2018

Conversation

@jdm
Copy link
Member

jdm commented Jan 25, 2018

This fixes a longstanding problem when highstating on servo-mac4, since the user requirement is defined in common/init.sls.


This change is Reviewable

@jdm
Copy link
Member Author

jdm commented Jan 26, 2018

r? @aneeshusa
I promise this is a tiny one.

@aneeshusa
Copy link
Member

aneeshusa commented Jan 27, 2018

@bors-servo r+
This shouldn't be required for full highstates since we always include the common SLS on not-Windows:

saltfs/top.sls

Lines 4 to 7 in f50214b

'not G@os:Windows':
- match: compound
- admin
- common
.
However, this is still an improvement in the case that someone uses state.sls to selectively run the buildbot.slave SLS, so it's good to have (helps with #496).

@bors-servo
Copy link
Contributor

bors-servo commented Jan 27, 2018

📌 Commit 8d6e862 has been approved by aneeshusa

@bors-servo
Copy link
Contributor

bors-servo commented Jan 27, 2018

Testing commit 8d6e862 with merge 8f8e00f...

bors-servo added a commit that referenced this pull request Jan 27, 2018
Import module for missing user requirement.

This fixes a longstanding problem when highstating on servo-mac4, since the user requirement is defined in common/init.sls.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/782)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 27, 2018

💔 Test failed - status-travis

@aneeshusa
Copy link
Member

aneeshusa commented Jan 27, 2018

Seemed to failed around starting the buildbot-slave service on OS X, so possibly related, but I think this is a Travis CI flake.
@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Jan 27, 2018

Testing commit 8d6e862 with merge a2231e7...

bors-servo added a commit that referenced this pull request Jan 27, 2018
Import module for missing user requirement.

This fixes a longstanding problem when highstating on servo-mac4, since the user requirement is defined in common/init.sls.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/782)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 27, 2018

☀️ Test successful - status-travis
Approved by: aneeshusa
Pushing a2231e7 to master...

@bors-servo bors-servo merged commit 8d6e862 into master Jan 27, 2018
3 checks passed
3 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
homu Test successful
Details
@jdm jdm removed the S-needs-deploy label Jan 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.