adding more stuff to CI page

Author: mattmakai

all.html

@@ -2217,14 +2217,21 @@ <h2>Open source CI projects</h2>
   <a href="https://github.com/jenkinsci/jenkins">Jenkins source code is on GitHub</a>.</p>
 </li>
 <li>
-<p><a href="http://www.go.cd/">Go CD</a> by ThoughtWorks was designed with the build and
-  test &amp; release cycles in mind. 
-  <a href="https://github.com/gocd/gocd">Go CD source code is on GitHub</a></p>
+<p><a href="http://www.go.cd/">Go CD</a> is a CI server by ThoughtWorks that was 
+  designed with best practices for the build and test &amp; release cycles in 
+  mind. <a href="https://github.com/gocd/gocd">Go CD source code is on GitHub</a>.</p>
 </li>
 <li>
 <p><a href="http://stridercd.com/">Strider</a> is a CI server written in node.js. 
   <a href="https://github.com/Strider-CD/strider">Strider source code is on GitHub</a>.</p>
 </li>
+<li>
+<p><a href="http://buildbot.net/">BuildBot</a> is a continuous integration <strong>framework</strong> 
+  with a set of components for creating your own CI server. It's written in
+  Python and intended for development teams that want more controller over
+  their build and deployment pipeline.
+  <a href="https://github.com/buildbot/buildbot">BuildBot source code is on GitHub</a>.</p>
+</li>
 </ul>
 <h2>Hosted CI services</h2>
 <ul>
@@ -2242,6 +2249,10 @@ <h2>Hosted CI services</h2>
 <p><a href="https://circleci.com/">Circle CI</a> works with open or closed source projects
   on GitHub and can deploy them to Heroku if builds are successful.</p>
 </li>
+<li>
+<p><a href="https://www.shippable.com/">Shippable</a> uses Docker containers to speed 
+  the build and integration process. It's free for public repositories.</p>
+</li>
 </ul>
 <h3>What do you want to add to your application next?</h3>
                       <h1>Configuration Management</h1>

continuous-integration.html

@@ -55,14 +55,21 @@ <h2>Open source CI projects</h2>
   <a href="https://github.com/jenkinsci/jenkins">Jenkins source code is on GitHub</a>.</p>
 </li>
 <li>
-<p><a href="http://www.go.cd/">Go CD</a> by ThoughtWorks was designed with the build and
-  test &amp; release cycles in mind. 
-  <a href="https://github.com/gocd/gocd">Go CD source code is on GitHub</a></p>
+<p><a href="http://www.go.cd/">Go CD</a> is a CI server by ThoughtWorks that was 
+  designed with best practices for the build and test &amp; release cycles in 
+  mind. <a href="https://github.com/gocd/gocd">Go CD source code is on GitHub</a>.</p>
 </li>
 <li>
 <p><a href="http://stridercd.com/">Strider</a> is a CI server written in node.js. 
   <a href="https://github.com/Strider-CD/strider">Strider source code is on GitHub</a>.</p>
 </li>
+<li>
+<p><a href="http://buildbot.net/">BuildBot</a> is a continuous integration <strong>framework</strong> 
+  with a set of components for creating your own CI server. It's written in
+  Python and intended for development teams that want more controller over
+  their build and deployment pipeline.
+  <a href="https://github.com/buildbot/buildbot">BuildBot source code is on GitHub</a>.</p>
+</li>
 </ul>
 <h2>Hosted CI services</h2>
 <ul>
@@ -80,6 +87,10 @@ <h2>Hosted CI services</h2>
 <p><a href="https://circleci.com/">Circle CI</a> works with open or closed source projects
   on GitHub and can deploy them to Heroku if builds are successful.</p>
 </li>
+<li>
+<p><a href="https://www.shippable.com/">Shippable</a> uses Docker containers to speed 
+  the build and integration process. It's free for public repositories.</p>
+</li>
 </ul>
 <h3>What do you want to add to your application next?</h3>
                   <div class="row">

feeds/all.atom.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-08-09T16:35:23Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-08-10T11:03:27Z</updated></feed>

source/content/pages/06-automation/0602-continuous-integration.markdown

@@ -32,13 +32,19 @@ do not break existing tests ensure the software works as intended.
   deploying to test and production servers. 
   [Jenkins source code is on GitHub](https://github.com/jenkinsci/jenkins).
 
-* [Go CD](http://www.go.cd/) by ThoughtWorks was designed with the build and
-  test & release cycles in mind. 
-  [Go CD source code is on GitHub](https://github.com/gocd/gocd)
+* [Go CD](http://www.go.cd/) is a CI server by ThoughtWorks that was 
+  designed with best practices for the build and test & release cycles in 
+  mind. [Go CD source code is on GitHub](https://github.com/gocd/gocd).
 
 * [Strider](http://stridercd.com/) is a CI server written in node.js. 
   [Strider source code is on GitHub](https://github.com/Strider-CD/strider).
 
+* [BuildBot](http://buildbot.net/) is a continuous integration **framework** 
+  with a set of components for creating your own CI server. It's written in
+  Python and intended for development teams that want more controller over
+  their build and deployment pipeline.
+  [BuildBot source code is on GitHub](https://github.com/buildbot/buildbot).
+
 
 ## Hosted CI services
 * [Travis CI](https://travis-ci.org/) provides free CI for open source 
@@ -52,5 +58,8 @@ do not break existing tests ensure the software works as intended.
 * [Circle CI](https://circleci.com/) works with open or closed source projects
   on GitHub and can deploy them to Heroku if builds are successful.
 
+* [Shippable](https://www.shippable.com/) uses Docker containers to speed 
+  the build and integration process. It's free for public repositories.
+
 
 ### What do you want to add to your application next?