From 840acfeb7e3cf477f649e56c8b47dad79dd46c1a Mon Sep 17 00:00:00 2001
From: Ryan Wilke <ryanwilke@gmail.com>
Date: Fri, 14 Sep 2018 14:12:37 -0700
Subject: [PATCH 1/5] Trying a sequential stage pipeline.

---
 Jenkinsfile | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 52d4789e..09e1103f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,11 +29,25 @@ pipeline {
       when {
         not { branch 'master' }
       }
-      steps {
-        // timeout(time: 10, unit: 'MINUTES') {
-        //   input 'Ready to review the styleguide?'
-        // }
-        echo 'This step only runs in Codeship builds at the moment: https://app.codeship.com/projects/246808'
+      stages {
+        stage('Percy') {
+          steps {
+            // timeout(time: 10, unit: 'MINUTES') {
+            //   input 'Ready to review the styleguide?'
+            // }
+            echo 'This step only runs in Codeship builds at the moment: https://app.codeship.com/projects/246808'
+          }
+        }
+        stage('Staging') {
+          steps {
+            echo 'Hello world'
+          }
+        }
+        stage('QA Team') {
+          steps {
+            echo 'Hello world'
+          }
+        }
       }
     }
     stage('Deploy') {

From bb00156bd5a3bbfe0e290db067e94aff749ffcc2 Mon Sep 17 00:00:00 2001
From: Ryan Wilke <ryanwilke@gmail.com>
Date: Fri, 14 Sep 2018 14:27:52 -0700
Subject: [PATCH 2/5] Try another style.

---
 Jenkinsfile | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 09e1103f..bdd260ee 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
       parallel {
         stage('Jekyll') {
           steps {
-            sh './ci/jekyll'
+            echo 'Hello world'
           }
         }
         stage('RSpec') {
@@ -32,10 +32,7 @@ pipeline {
       stages {
         stage('Percy') {
           steps {
-            // timeout(time: 10, unit: 'MINUTES') {
-            //   input 'Ready to review the styleguide?'
-            // }
-            echo 'This step only runs in Codeship builds at the moment: https://app.codeship.com/projects/246808'
+            echo 'This step only runs in CodeShip builds at the moment: https://app.codeship.com/projects/246808'
           }
         }
         stage('Staging') {
@@ -44,8 +41,22 @@ pipeline {
           }
         }
         stage('QA Team') {
-          steps {
-            echo 'Hello world'
+          stages {
+            stage('A') {
+              steps {
+                echo 'Hello world'
+              }
+            }
+            stage('B') {
+              steps {
+                echo 'Hello world'
+              }
+            }
+            stage('C') {
+              steps {
+                echo 'Hello world'
+              }
+            }
           }
         }
       }

From c0195e8be63e021bb8ba4f502c1610366d4ce1e2 Mon Sep 17 00:00:00 2001
From: Ryan Wilke <ryanwilke@gmail.com>
Date: Fri, 14 Sep 2018 14:39:22 -0700
Subject: [PATCH 3/5] Trying another test

---
 Jenkinsfile | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bdd260ee..590eeb49 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,36 +29,36 @@ pipeline {
       when {
         not { branch 'master' }
       }
-      stages {
+      parallel {
         stage('Percy') {
-          steps {
-            echo 'This step only runs in CodeShip builds at the moment: https://app.codeship.com/projects/246808'
-          }
-        }
-        stage('Staging') {
-          steps {
-            echo 'Hello world'
-          }
-        }
-        stage('QA Team') {
           stages {
-            stage('A') {
+            stage ('Percy-1') {
               steps {
                 echo 'Hello world'
               }
             }
-            stage('B') {
+            stage ('Percy-2') {
               steps {
                 echo 'Hello world'
               }
             }
-            stage('C') {
+            stage ('Percy-3') {
               steps {
                 echo 'Hello world'
               }
             }
           }
         }
+        stage('QA') {
+          steps {
+            echo 'Hello world'
+          }
+        }
+        stage('Staging') {
+          steps {
+            echo 'Hello world'
+          }
+        }
       }
     }
     stage('Deploy') {

From 830d34edc45edcfd8649bbb542be2dd10d5155db Mon Sep 17 00:00:00 2001
From: Ryan Wilke <ryanwilke@gmail.com>
Date: Fri, 14 Sep 2018 14:42:37 -0700
Subject: [PATCH 4/5] Do some real world data.

---
 Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 590eeb49..a65b3984 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,19 +30,19 @@ pipeline {
         not { branch 'master' }
       }
       parallel {
-        stage('Percy') {
+        stage('Browser Tests') {
           stages {
-            stage ('Percy-1') {
+            stage ('Chrome') {
               steps {
                 echo 'Hello world'
               }
             }
-            stage ('Percy-2') {
+            stage ('Safari') {
               steps {
                 echo 'Hello world'
               }
             }
-            stage ('Percy-3') {
+            stage ('Firefox') {
               steps {
                 echo 'Hello world'
               }

From e17972a7922e35f7026baa8a9c99b26b2e42b291 Mon Sep 17 00:00:00 2001
From: Ryan Wilke <ryanwilke@gmail.com>
Date: Fri, 14 Sep 2018 15:04:32 -0700
Subject: [PATCH 5/5] Made the changes more realistic.

---
 Jenkinsfile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a65b3984..955199b9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,8 @@ pipeline {
       parallel {
         stage('Jekyll') {
           steps {
-            echo 'Hello world'
+            // sh './ci/jekyll'
+            echo 'Commented out as the Jekyll tests are a little broken at the moment.'
           }
         }
         stage('RSpec') {
@@ -49,9 +50,15 @@ pipeline {
             }
           }
         }
-        stage('QA') {
+        stage('Percy') {
+          when {
+            not { branch 'master' }
+          }
           steps {
-            echo 'Hello world'
+            // timeout(time: 10, unit: 'MINUTES') {
+            //   input 'Ready to review the styleguide?'
+            // }
+            echo 'This step only runs in Codeship builds at the moment: https://app.codeship.com/projects/246808'
           }
         }
         stage('Staging') {