Merge pull request apache#20 from mesosphere/rename-to-agents

Rename to agents

Author: ssk2

README.md

@@ -9,17 +9,17 @@ Running the `pipeline` command will:
 
 2. Sets up a Jenkins "workflow" pipeline job and the necessary credentials to demonstrate a basic continuous delivery pipeline.  Jenkins will:
 
-    + Spin up a new Jenkins slave using the Mesos plugin. This slave runs inside a Docker container on one of our DC/OS agents.
+    + Spin up a new Jenkins agent using the Mesos plugin. This agent runs inside a Docker container on one of our DC/OS agents.
     + Clone the git repository
     + Build a Docker container based off the [Jekyll Docker image](https://hub.docker.com/r/jekyll/jekyll/) that includes the content stored in [/site](/site) and push it to DockerHub.
     + Run the newly created container and a [Linkchecker container](https://github.com/mesosphere/docker-containers/blob/master/utils/linkchecker/Dockerfile) that runs a basic integration test against the container, checking that the webserver comes up correctly and that all links being served are valid (i.e. no 404s).
     + Manually trigger a Marathon deployment of the newly created container to the DC/OS base Marathon instance. If the application already exists, Marathon will simply upgrade it.
-    + Make the application available on a public slave at port 80 using Marathon-lb.
+    + Make the application available on a public agent at port 80 using Marathon-lb.
 
-When run with the `dynamic-slaves` command, it will:
+When run with the `dynamic-agents` command, it will:
 
 3. Creates 50 build jobs that take a random amount of time between 1 and 2 minutes. These jobs will randomly fail.
-    + The Mesos plugin will spin up build slaves on demand for these jobs, using as much capacity as your cluster has available.
+    + The Mesos plugin will spin up build agents on demand for these jobs, using as much capacity as your cluster has available.
     + When these jobs are finished, the Jenkins tasks will terminate and the resources will be relinquished back to other users of your cluster.
 
 When run with the `uninstall` command, it will:
@@ -69,7 +69,7 @@ When run with the `uninstall` command, it will:
 
     NOTE: You must use the domain name for your cluster; the IP address will fail.
 
-2. You can now run either the pipeline demo or the dynamic slaves demo. To run the pipeline demo, you will also need to specify the ELB address (`Public Slave`):
+2. You can now run either the pipeline demo or the dynamic agents demo. To run the pipeline demo, you will also need to specify the ELB address (`Public Agent`):
 
     ```
     python bin/demo.py pipeline  --password=$PASSWORD http://my.elb/ http://my.dcos.cluster/
@@ -85,13 +85,13 @@ When run with the `uninstall` command, it will:
 
 ![deployed-app](/img/deployed-jekyll-app.png)
 
-7. Now let's run the dynamic slaves demo. It will create 50 jobs that will randomly fail.
+7. Now let's run the dynamic agents demo. It will create 50 jobs that will randomly fail.
 
     ```
-    python bin/demo.py dynamic-slaves http://my.dcos.cluster/
+    python bin/demo.py dynamic-agents http://my.dcos.cluster/
     ```
 
-8. Navigate back to the Jenkins and/or DC/OS UI to show build slaves spinning up manually.
+8. Navigate back to the Jenkins and/or DC/OS UI to show build agents spinning up manually.
 
 ### Uninstalling
 
@@ -144,7 +144,7 @@ By default, this script assumes you will be pushing to the [mesosphere/cd-demo-a
 
 ### Demonstrating Multi-tenancy
 
-To demonstrate how you can install multiple Jenkins instances side by side on DC/OS, simply give your Jenkins instances unique names using the `--name` argument and run the demo as follows. Note that if you only have one public slave, you will not be able to deploy applications from multiple pipelines (each application requires port 80).
+To demonstrate how you can install multiple Jenkins instances side by side on DC/OS, simply give your Jenkins instances unique names using the `--name` argument and run the demo as follows. Note that if you only have one public agent, you will not be able to deploy applications from multiple pipelines (each application requires port 80).
 
 1. Create one instance:
 

bin/demo.py

@@ -4,7 +4,7 @@
 Usage:
     demo.py install [options] <dcos_url>
     demo.py pipeline [options] <elb_url> <dcos_url>
-    demo.py dynamic-slaves [options] <dcos_url>
+    demo.py dynamic-agents [options] <dcos_url>
     demo.py cleanup [options] <dcos_url>
     demo.py uninstall [options] <dcos_url>
 
@@ -27,7 +27,7 @@
 The continuous delivery demo will create a build pipeline that will deploy a
 Docker container to the DC/OS Marathon.
 
-The dynamic slaves demo will create 50 (by default) "freestyle" Jenkins jobs.
+The dynamic agents demo will create 50 (by default) "freestyle" Jenkins jobs.
 Each of these jobs will appear as a separate Jenkins build, and will randomly
 pass or fail. The duration of each job will be between 120 and 240 seconds.
 """
@@ -284,7 +284,7 @@ def demo_pipeline(jenkins_url, elb_url, name, branch, org, username, password):
     log("demo pipeline (workflow) created")
     log("once deployed, your application should be available at:\n\t{}".format(elb_url))
 
-def demo_dynamic_slaves(jenkins_url, builds):
+def demo_dynamic_agents(jenkins_url, builds):
     log("creating {} freestyle Jenkins jobs".format(builds))
     random.seed()
     with open("jobs/demo-job/config.xml") as demo_job:
@@ -304,7 +304,7 @@ def cleanup_pipeline_jobs(jenkins_url):
     delete_credentials(jenkins_url, "dcos-token")
     delete_job(jenkins_url, "pipeline-demo")
 
-def cleanup_dynamic_slaves_jobs(jenkins_url, builds):
+def cleanup_dynamic_agents_jobs(jenkins_url, builds):
     log("cleaning up {} builds".format(builds))
     for i in range(builds):
         job_name = "demo-job-{0:02d}".format(i)
@@ -316,7 +316,7 @@ def cleanup_deployed_app():
 def cleanup(jenkins_url, builds):
     cleanup_pipeline_jobs(jenkins_url)
     cleanup_deployed_app()
-    cleanup_dynamic_slaves_jobs(jenkins_url, builds)
+    cleanup_dynamic_agents_jobs(jenkins_url, builds)
 
 def uninstall(jenkins_name):
     log("uninstalling Jenkins with name '{}'".format(jenkins_name))
@@ -350,8 +350,8 @@ def uninstall(jenkins_name):
             install_marathon_lb(elb_url)
             update_and_push_marathon_json(elb_url, branch)
             demo_pipeline(jenkins_url, elb_url, jenkins_name, branch, org, username, password)
-        elif arguments['dynamic-slaves']:
-            demo_dynamic_slaves(jenkins_url, builds)
+        elif arguments['dynamic-agents']:
+            demo_dynamic_agents(jenkins_url, builds)
         elif arguments['cleanup']:
             cleanup(jenkins_url, builds)
         elif arguments['uninstall']: