This repository was archived by the owner on Dec 16, 2024. It is now read-only.
Add test to check Buildbot master config#307
Merged
bors-servo merged 3 commits intoservo:masterfrom Apr 7, 2016
Merged
Conversation
Split the master and slave states into separate directories, use the standard files/ directory, and use more Jinja templating.
Automatically restarting Buildbot when there are outstanding builds causes them to get lost and is generally a bad idea. Until we have a more robust way to restart the Buildbot master on configuration change, disable the auto-restart behavior.
This test can be run via `./test.py sls.buildbot.master`. It will only work properly once the Buildbot master states have been run, and is meant to be run either in Vagrant or on Travis, not locally. Running `./test.py` without arguments will only run the linting tests, since those can be run anywhere with just the source code. For now, hard-code this test to be run on the servo-master1 node on Travis. This should be replaced with a more intelligent test dispatcher in `test.py` which uses the top file via Salt's state.show_top in the future, but hard coding this for now will reduce Buildbot's fragility.
Contributor
|
@bors-servo r+ Thank you! This looks great! |
Contributor
|
📌 Commit d5f50b0 has been approved by |
Contributor
bors-servo
pushed a commit
that referenced
this pull request
Apr 7, 2016
Add test to check Buildbot master config A few things in this PR (in separate commits): - Refactor the Buildbot states to standard paths, use more Jinja templating - Switch the Buildbot master service to not restart automatically. **It will need to be restarted manually if there are configuration changes.** This should alleviate the need for `state.apply`. - Use the `buildbot checkconfig` command to confirm the syntax of the Buildbot master configuration, and run it on Travis. This can be run via `./test.py sls.buildbot.master`, but note that this won't work locally - it needs to be run in an environment where the Buildbot master states have run, i.e. Travis or Vagrant. cc @larsbergstrom @edunham <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/307) <!-- Reviewable:end -->
Contributor
|
This is awesome - great work @aneeshusa! |
Contributor
|
☀️ Test successful - travis |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A few things in this PR (in separate commits):
state.apply.buildbot checkconfigcommand to confirm the syntax of the Buildbot master configuration, and run it on Travis. This can be run via./test.py sls.buildbot.master, but note that this won't work locally - it needs to be run in an environment where the Buildbot master states have run, i.e. Travis or Vagrant.cc @larsbergstrom @edunham
This change is