Merge pull request #1 from duncanscott/get-full-name

Get full name
TrainingByPackt · Oct 26, 2018 · 9424449 · 9424449
2 parents ed6a40f + 0be94db
commit 9424449
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/Lesson1/Note b/Lesson1/Note
diff --git a/Lesson1/Note: No code files required b/Lesson1/Note: No code files required
diff --git a/Lesson2/Note b/Lesson2/Note
diff --git a/Lesson2/Note: No code files required b/Lesson2/Note: No code files required
diff --git a/Lesson5/.test_functions.py.swp b/Lesson5/.test_functions.py.swp
diff --git a/Lesson5/Jenkinsfile b/Lesson5/Jenkinsfile
@@ -1,16 +1,21 @@
-// Allocate Build Node
 node('master') {
     stage("Fetch Source Code") {
-        git 'https://github.com/TrainingByPackt/Beginning-Continuous-Delivery-With-Jenkins'
+        git 'https://github.com/TrainingByPackt/Beginning-Jenkins.git'
     }
-
+    
     dir('Lesson5') {
         printMessage('Running Pipeline')
-
         stage("Testing") {
             sh 'python test_functions.py'
         }
-
+        stage("Deployment") {
+            if (env.BRANCH_NAME == 'master') {
+                printMessage('Deploying the master branch')
+            } else {
+                printMessage("No deployment for branch [${env.BRANCH_NAME}]")
+            }
+
+        }
         printMessage('Pipeline Complete')
     }
 }

diff --git a/Lesson5/test_functions.py b/Lesson5/test_functions.py
@@ -2,6 +2,7 @@
 
 from functions import *
 
+
 class TestFunctions(unittest.TestCase):
     """ Test add_values
     """
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     from functions import *
     class TestFunctions(unittest.TestCase):
         """ Test add_values
         """
@@ Expand Down @@