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 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/Jenkinsfile b/Lesson5/Jenkinsfile new file mode 100644 index 000000000..2beca52d2 --- /dev/null +++ b/Lesson5/Jenkinsfile @@ -0,0 +1,27 @@ +node('master') { + stage("Fetch Source Code") { + cleanWs() + git ([url: 'https://github.com/bstephgit/jenkins', 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}" +} 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() diff --git a/NewUser.txt b/NewUser.txt deleted file mode 100644 index e69de29bb..000000000 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 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); - } -} - -?>