From f08f83b7d6a5ec26a9a325de510f08caf3ae5b16 Mon Sep 17 00:00:00 2001 From: bstephgit Date: Tue, 31 Dec 2019 16:28:02 +0100 Subject: [PATCH 1/8] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index debcd9c23..792764d81 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,2 @@ -# travis-broken-example - -An example that will cause a build failure +# Jenkins tutorial +repository for jenkins tutorial From 8d1386e07635befc47108f4ec78dec7803f22a00 Mon Sep 17 00:00:00 2001 From: bstephgit Date: Tue, 31 Dec 2019 16:28:39 +0100 Subject: [PATCH 2/8] Delete Test.php --- Test.php | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Test.php diff --git a/Test.php b/Test.php deleted file mode 100644 index 4b44aa0f9..000000000 --- a/Test.php +++ /dev/null @@ -1,10 +0,0 @@ -assertEquals(1+1,1); - } -} - -?> From 560ecd515f60f35b1f7ce864849937530ff5d3b4 Mon Sep 17 00:00:00 2001 From: bstephgit Date: Tue, 31 Dec 2019 16:28:52 +0100 Subject: [PATCH 3/8] Delete .travis.yml --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 8b3e1cc83..000000000 --- a/.travis.yml +++ /dev/null @@ -1,6 +0,0 @@ -language: php -php: - - 5.5 - - 5.4 - - hhvm -script: phpunit Test.php From 720e6385689ced46907e94b61d1d0d945d391a07 Mon Sep 17 00:00:00 2001 From: bstephgit Date: Tue, 31 Dec 2019 16:29:01 +0100 Subject: [PATCH 4/8] Delete NewUser.txt --- NewUser.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 NewUser.txt diff --git a/NewUser.txt b/NewUser.txt deleted file mode 100644 index e69de29bb..000000000 From c8c618d3f2f0e6e9b1700df5cd883542381cdea0 Mon Sep 17 00:00:00 2001 From: Albert Date: Tue, 31 Dec 2019 16:41:19 +0100 Subject: [PATCH 5/8] adding files for lesson 5 demo --- Lesson5/.gitignore | 1 + Lesson5/functions.py | 35 +++++++++++++++++++++++++++++++++++ Lesson5/test_functions.py | 23 +++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 Lesson5/.gitignore create mode 100644 Lesson5/functions.py create mode 100644 Lesson5/test_functions.py diff --git a/Lesson5/.gitignore b/Lesson5/.gitignore new file mode 100644 index 000000000..c18dd8d83 --- /dev/null +++ b/Lesson5/.gitignore @@ -0,0 +1 @@ +__pycache__/ diff --git a/Lesson5/functions.py b/Lesson5/functions.py new file mode 100644 index 000000000..7f92bcee8 --- /dev/null +++ b/Lesson5/functions.py @@ -0,0 +1,35 @@ +def add_two_values(value1, value2): + """ Adds two integers + + Arguments: + value1: first integer value e.g. 10 + value2: second integer value e.g. 2 + """ + return value1 + value2 + +def add_multiple_values(*args): + """ Adds a list of integers + + Arguments: + args: A list of integers e.g. 1,2,3,4,5 + """ + sum_ = 0 + for number in args: + sum_ = sum_ + number + + return sum_ + +def get_full_name(firstname, lastname): + """ Return the full name in the format firstname, lastname + + Arguments: + firstname: First name e.g. John + lastname: Last name e.g. Doe + """ + return lastname + ", " + firstname + +def main(): + add_multiple_values(1,2,3,4,5) + +if __name__ == '__main__': + main() diff --git a/Lesson5/test_functions.py b/Lesson5/test_functions.py new file mode 100644 index 000000000..b1ac78273 --- /dev/null +++ b/Lesson5/test_functions.py @@ -0,0 +1,23 @@ +import unittest + +from functions import * + + +class TestFunctions(unittest.TestCase): + """ Test add_values + """ + def setUp(self): + self.value1 = 10 + self.value2 = 20 + + def test_add_values(self): + self.assertEqual(30, add_two_values(self.value1, self.value2)) + + def test_add_values_two(self): + self.assertEqual(15, add_multiple_values(1,2,3,4,5)) + + def test_full_name(self): + self.assertEqual("Doe, John", get_full_name("John", "Doe")) + +if __name__ == '__main__': + unittest.main() From 46611f50185272347b471583171ef4d432c03bad Mon Sep 17 00:00:00 2001 From: Albert Date: Tue, 31 Dec 2019 17:42:27 +0100 Subject: [PATCH 6/8] Adding Jenkins file for Lesson5 demo --- Lesson5/Jenkinsfile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Lesson5/Jenkinsfile diff --git a/Lesson5/Jenkinsfile b/Lesson5/Jenkinsfile new file mode 100644 index 000000000..70438a458 --- /dev/null +++ b/Lesson5/Jenkinsfile @@ -0,0 +1,27 @@ +node('master') { + stage("Fetch Source Code") { + cleanWs() + git ([url: 'https://github.com/bstephgit/jenkins/tree/master/Lesson5', branch: 'add-functions-and-tests']) + } + + dir('Lesson5') { + printMessage('Running Pipeline') + stage("Testing") { + sh 'ls -la' + sh 'python3 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') + } +} + +def printMessage(message) { + echo "${message}" +} From a6da14cb4cdf1196f3adef394d112905b04f1694 Mon Sep 17 00:00:00 2001 From: Albert Date: Tue, 31 Dec 2019 18:03:47 +0100 Subject: [PATCH 7/8] Jenkinsfile fix github repo url --- Lesson5/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lesson5/Jenkinsfile b/Lesson5/Jenkinsfile index 70438a458..2af921df4 100644 --- a/Lesson5/Jenkinsfile +++ b/Lesson5/Jenkinsfile @@ -1,7 +1,7 @@ node('master') { stage("Fetch Source Code") { cleanWs() - git ([url: 'https://github.com/bstephgit/jenkins/tree/master/Lesson5', branch: 'add-functions-and-tests']) + git ([url: 'https://github.com/bstephgit/jenkins', branch: 'add-functions-and-tests']) } dir('Lesson5') { From ad39afc02047f0c12ca0147bdde48f65ef4179de Mon Sep 17 00:00:00 2001 From: Albert Date: Tue, 31 Dec 2019 18:12:57 +0100 Subject: [PATCH 8/8] Jenkinsfile litlle modif --- Lesson5/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lesson5/Jenkinsfile b/Lesson5/Jenkinsfile index 2af921df4..2beca52d2 100644 --- a/Lesson5/Jenkinsfile +++ b/Lesson5/Jenkinsfile @@ -1,5 +1,5 @@ node('master') { - stage("Fetch Source Code") { + stage("Fetch Source Code") { cleanWs() git ([url: 'https://github.com/bstephgit/jenkins', branch: 'add-functions-and-tests']) }