Lauren's stuff

content/rancher/concepts/ci-cd-pipelines/_index.md

@@ -4,3 +4,12 @@ weight: 2350
 ---
 
 # CI/CD Pipelines
+
+<dl>
+	<dt>Pipelines</dt>
+	<dd>Contain a series of stages and steps. Out of the box the pipelines feature supports fan out and in capabilities.</dd>
+	<dt>Stages</dt>
+	<dd>Executed sequentially. The next stage will not execute until all of the steps within the stage execute.</dd>
+	<dt>Steps</dt>
+	<dd>Are executed in parallel within a stage. </dd>
+</dl>

content/rancher/tasks/pipelines/_index.md

@@ -4,19 +4,81 @@ weight: 3700
 ---
 # Pipelines
 
-Coming Soon
+## Enabling CI Pipelines
+
+1. Select cluster from drop down.
+
+2. Under tools menu select pipelines.
+
+3. Follow instructions for setting up github auth on page.
+
 
 ## Creating CI Pipelines
 
-Coming Soon
+1. Go to the project you want this pipeline to run in.
+
+2. Select workloads from the top level Nav bar
+
+3. Select pipelines from from the secondary Nav bar
+
+4. Click Add pipeline button.
+
+5. Enter in your repository name (Autocomplete should help zero in on it quickly).
+
+6. Select Branch options.
+
+-	Only the branch {BRANCH NAME}: Only events triggered by changes to this branch will be built.
+-	Evertyhing but {BRANCH NAME}: Build any branch that triggered an event EXCEPT events from this branch.
+-	All branches: Regardless of the branch that triggered the event always build.
+
+7. Click Add button.
+
+	By default, Rancher provides a three stage pipeline for you. It consists of a build stage where you would compile, unit test, and scan code. The publish stage has a single step to publish a docker image.
+
+
+8. Add a name to the pipeline in order to complete adding a pipeline.
+
+9. Click on the ‘run a script’ box under the ‘Build’ stage.
+
+	Here you can set the image, or select from pre-packaged envs.
+
+10. Configure a shell script to run inside the container when building.
+
+11. Click Save to persist the changes.
+
+Click the “publish an image’ box under the “Publish” stage.
+
+
+Set the location of the Dockerfile, by default it looks in the root of the workspace.
+Set the build context for building the image relative to the root of the workspace.
+
+Set the image information:
+The registry is the remote registry URL. It is defaulted to Docker hub.
+Repository is the <org>/<repo> in the repository.
+Finally select the Tag. You can hard code a tag like ‘latest’ or select from a list of available variables.
+
+Finally, if this is the first time using this registry, you can add the username/password for pushing the image. You must click save for the registry credentials AND also save for the modal.
+
+
+
 
 ## Creating a New Stage
 
-Coming Soon
+1. To add a new stage the user must click the ‘add a new stage’ link in either create or edit mode of the pipeline view.
+
+2. Provide a name for the stage.
+
+3. Click save
+
 
 ## Creating a New Step
 
-Coming Soon
+1. Go to create / edit mode of the pipeline.
+
+2. Click “Add Step” button in the stage that you would like to add a step in.
+
+3. Fill out the form as detailed above
+
 
 ### Adding a Build Script
 
@@ -28,4 +90,4 @@ Coming Soon
 
 ## Importing a Pipeline From YAML
 
-Coming Soon
+If there is a ##YAML FILE### already checked into the github repository click import.

content/rancher/upgrades/_index.md

@@ -1,8 +1,19 @@
 ---
 title: Upgrades
 weight: 1000
+draft: true
 ---
 
 # Upgrades
 
-Coming Soon!
+- Upgrading from Rancher 2.x.x
+
+	All Rancher 2.x.x will support upgrades from a previous version.  This section will be updated as soon as the first release post 2.0 is available.
+
+- Migrating from Rancher 1.6.x
+
+    By embarking on the Rancher 2.0 project, all of the legacy Rancher 1.6 Java modules were completely rewritten in Go, and in the process touched just about every other module in the system. As such, there will not be a direct upgrade  from 1.6.x to 2.0.
+
+    Our next major milestone will be our 2.1 release that will include a tool that will convert Rancher Compose to Kubernetes YAML.  This will help our existing Cattle users from having to start the migration from scratch.  However, we know the biggest challenge will be having to leverage Cattle functionality in a Kubernetes environment as you deploy new workloads.  We plan to also release a guide that will act as a cheatsheet for those that enjoy Cattle's simplicity and want to quickly create those workloads in Kubernetes.
+
+     We do plan to continue to support Rancher 1.6.x for at least another year after 2.1 has been released to give our users time to plan this migration.