Skip to content

Commit e4289fc

Browse files
dinatale2morrone
authored andcommittedApr 15, 2016
Updated the README to reflect recent changes. (#2)
Updated sample code to reflect current object names. Also added a link to the opensfs fork of the buildbot project. Signed-off-by: Giuseppe Di Natale <[email protected]>
1 parent 4e4ad6e commit e4289fc

File tree

1 file changed

+7
-30
lines changed

1 file changed

+7
-30
lines changed
 

‎README.md

+7-30
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ The Lustre project relies on Gerrit to track proposed changes. Changes
1515
submitted to Gerrit are called patch sets. Each patch set submitted will
1616
be automatically tested by the buildbot. As you fix the code and push
1717
new changes to Gerrit, each patch set is queued to be tested.
18-
Currently, all patch sets submitted are built using SPL and ZFS version
19-
0.6.5.4.
2018

2119
### Builder Types
2220

@@ -63,7 +61,7 @@ This means the logic for a particular build step can be separated from the
6361
* `/etc/buildslave` - This file is dynamically generated by the
6462
`bb-bootstrap.sh` script and is run at boot time by the ec2 user data
6563
facility. It includes all the information required to configure and
66-
start a latent buildslave. Most importabtly for scripts this includes
64+
start a latent buildslave. Most importantly for scripts this includes
6765
the `BB_NAME` variable which is set to the build slave name.
6866

6967
* Provides a consistent way to trap and handle signals from the buildbot
@@ -107,7 +105,7 @@ process begins by adding the new builder and slave to the `master.cfg` file.
107105
One important thing to be aware of is that each builder can potentially have
108106
multiple build slaves.
109107

110-
The first step is to determine what kind of slave your setting up. Both
108+
The first step is to determine what kind of slave you're setting up. Both
111109
standard and latent build slaves are supported.
112110

113111
Once you've added your slaves, be sure to add them to the `all_slaves` list
@@ -118,10 +116,8 @@ how to add various types of slaves.
118116
* Linux based m3.large EC2 slave
119117
```
120118
newslaves = [
121-
M3LargeEC2SpotSlave(
119+
LustreEC2Slave(
122120
name="slavename",
123-
master=bb_master,
124-
url=bb_url,
125121
ami="ami-xxxxxxxx"
126122
),
127123
....
@@ -131,31 +127,14 @@ newslaves = [
131127
* Suse based m3.large EC2 slave
132128
```
133129
newslaves = [
134-
M3LargeEC2SuseSpotSlave(
130+
LustreEC2SuseSlave(
135131
name="slavename",
136-
master=bb_master,
137-
url=bb_url,
138132
ami="ami-xxxxxxxx"
139133
),
140134
....
141135
]
142136
```
143137

144-
* Persistent build slave
145-
```
146-
newslaves = [
147-
BuildSlave(
148-
name="slavename",
149-
password="password"
150-
),
151-
....
152-
]
153-
```
154-
155-
EC2 backed slaves do not require `master` or `url` to be provided.
156-
`master` and/or `url` are only necessary if you are standing up your own Lustre
157-
Buildbot instance.
158-
159138
Now that your build slaves have been added, a builder needs to be created which
160139
owns them. Jump down to the the BUILDERS section and add a
161140
`LustreBuilderConfig` entry to the appropriate list. Each builder must
@@ -182,13 +161,11 @@ http://build.lustre.org/ and it leverages Gerrit's stream-events functionality
182161
to queue changes to test. Developers are encouraged to use this infrastructure
183162
when working on a change. However, this code can be used as a basis for
184163
building a private build and test environment. This may be useful when working
185-
on extending the testing infrastructure itself.
164+
on extending the testing infrastructure itself. We also maintain our own fork of
165+
the open source Buildbot project which can be found at
166+
https://github.com/opensfs/buildbot.
186167

187168
Generally speaking to do this you will need to create a `password.py` file
188169
with your credentials, then list your builders in the `master.cfg` file, and
189170
finally start the builder master. It's assumed you're already familiar with
190171
Amazon ec2 instances and their terminology.
191-
192-
## Licensing
193-
194-
See the [LICENSE](LICENSE) file for license rights and limitations.

0 commit comments

Comments
 (0)
Please sign in to comment.