From 49db0ec05b1a8d24f043e4defa529b73284aeb04 Mon Sep 17 00:00:00 2001 From: DaWilliam Date: Sat, 3 Mar 2018 12:58:08 -0500 Subject: [PATCH 01/11] Tutorial Jenkinsfile in Root Directory old Jenkins file in jenkins folder --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..59e00e3 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,15 @@ +pipeline { + agent none + stages { + stage('Build') { + agent { + docker { + image 'python:2-alpine' + } + } + steps { + sh 'python -m py_compile sources/add2vals.py sources/calc.py' + } + } + } +} \ No newline at end of file From 072185146a824ad5b5d511083c12375090db6857 Mon Sep 17 00:00:00 2001 From: DaWilliam Date: Sat, 3 Mar 2018 14:40:00 -0500 Subject: [PATCH 02/11] Delete Jenkinsfile --- jenkins/Jenkinsfile | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 jenkins/Jenkinsfile diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile deleted file mode 100644 index 93796b6..0000000 --- a/jenkins/Jenkinsfile +++ /dev/null @@ -1,45 +0,0 @@ -pipeline { - agent none - stages { - stage('Build') { - agent { - docker { - image 'python:2-alpine' - } - } - steps { - sh 'python -m py_compile sources/add2vals.py sources/calc.py' - } - } - stage('Test') { - agent { - docker { - image 'qnib/pytest' - } - } - steps { - sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py' - } - post { - always { - junit 'test-reports/results.xml' - } - } - } - stage('Deliver') { - agent { - docker { - image 'cdrx/pyinstaller-linux:python2' - } - } - steps { - sh 'pyinstaller --onefile sources/add2vals.py' - } - post { - success { - archiveArtifacts 'dist/add2vals' - } - } - } - } -} From bf2b70e7e7134fe90ba2bb803c18f49b5a292d89 Mon Sep 17 00:00:00 2001 From: DaWilliam Date: Sat, 3 Mar 2018 16:05:27 -0500 Subject: [PATCH 03/11] Readded Jenkins Folder --- jenkins/Jenkinsfile | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 jenkins/Jenkinsfile diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile new file mode 100644 index 0000000..93796b6 --- /dev/null +++ b/jenkins/Jenkinsfile @@ -0,0 +1,45 @@ +pipeline { + agent none + stages { + stage('Build') { + agent { + docker { + image 'python:2-alpine' + } + } + steps { + sh 'python -m py_compile sources/add2vals.py sources/calc.py' + } + } + stage('Test') { + agent { + docker { + image 'qnib/pytest' + } + } + steps { + sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py' + } + post { + always { + junit 'test-reports/results.xml' + } + } + } + stage('Deliver') { + agent { + docker { + image 'cdrx/pyinstaller-linux:python2' + } + } + steps { + sh 'pyinstaller --onefile sources/add2vals.py' + } + post { + success { + archiveArtifacts 'dist/add2vals' + } + } + } + } +} From f4e58a9de3a2c3cdfcee60cc38e586032ce5469e Mon Sep 17 00:00:00 2001 From: DaWilliam Date: Sat, 3 Mar 2018 18:25:10 -0500 Subject: [PATCH 04/11] Same Moved Changes 3 --- Jenkinsfile | 15 --------------- jenkins/Jenkinsfile | 40 +++++----------------------------------- 2 files changed, 5 insertions(+), 50 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 59e00e3..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,15 +0,0 @@ -pipeline { - agent none - stages { - stage('Build') { - agent { - docker { - image 'python:2-alpine' - } - } - steps { - sh 'python -m py_compile sources/add2vals.py sources/calc.py' - } - } - } -} \ No newline at end of file diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 93796b6..59e00e3 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -1,45 +1,15 @@ pipeline { - agent none + agent none stages { - stage('Build') { + stage('Build') { agent { docker { - image 'python:2-alpine' + image 'python:2-alpine' } } steps { - sh 'python -m py_compile sources/add2vals.py sources/calc.py' - } - } - stage('Test') { - agent { - docker { - image 'qnib/pytest' - } - } - steps { - sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py' - } - post { - always { - junit 'test-reports/results.xml' - } - } - } - stage('Deliver') { - agent { - docker { - image 'cdrx/pyinstaller-linux:python2' - } - } - steps { - sh 'pyinstaller --onefile sources/add2vals.py' - } - post { - success { - archiveArtifacts 'dist/add2vals' - } + sh 'python -m py_compile sources/add2vals.py sources/calc.py' } } } -} +} \ No newline at end of file From 6128d1ea3ba384aac61bec53b0e4f048711f6c0d Mon Sep 17 00:00:00 2001 From: DaWilliam Date: Sat, 3 Mar 2018 21:53:39 -0500 Subject: [PATCH 05/11] MovedFileOut --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..59e00e3 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,15 @@ +pipeline { + agent none + stages { + stage('Build') { + agent { + docker { + image 'python:2-alpine' + } + } + steps { + sh 'python -m py_compile sources/add2vals.py sources/calc.py' + } + } + } +} \ No newline at end of file From 64865c06e0cda57e6cc8c1b4ea6c4f0ac1774e39 Mon Sep 17 00:00:00 2001 From: DaWilliam Date: Sat, 3 Mar 2018 23:33:04 -0500 Subject: [PATCH 06/11] Remove Default JenkinsFile --- jenkins/Jenkinsfile | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 jenkins/Jenkinsfile diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile deleted file mode 100644 index 59e00e3..0000000 --- a/jenkins/Jenkinsfile +++ /dev/null @@ -1,15 +0,0 @@ -pipeline { - agent none - stages { - stage('Build') { - agent { - docker { - image 'python:2-alpine' - } - } - steps { - sh 'python -m py_compile sources/add2vals.py sources/calc.py' - } - } - } -} \ No newline at end of file From 2f51094b112fd0f041027649978d7abf626a4748 Mon Sep 17 00:00:00 2001 From: DaWilliam Date: Sat, 3 Mar 2018 23:54:45 -0500 Subject: [PATCH 07/11] commented out --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 59e00e3..ccd712e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,12 +4,12 @@ pipeline { stage('Build') { agent { docker { - image 'python:2-alpine' + //image 'python:2-alpine' } } steps { - sh 'python -m py_compile sources/add2vals.py sources/calc.py' + //sh 'python -m py_compile sources/add2vals.py sources/calc.py' } } } -} \ No newline at end of file +} From 1988ed4362537722c3b71a50b6f71c3f27101268 Mon Sep 17 00:00:00 2001 From: DaWilliam Date: Sat, 3 Mar 2018 23:56:37 -0500 Subject: [PATCH 08/11] replaced to just echo's --- Jenkinsfile | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ccd712e..b982250 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,14 +1,20 @@ pipeline { - agent none + agent any + stages { - stage('Build') { - agent { - docker { - //image 'python:2-alpine' - } - } + stage('Build') { steps { - //sh 'python -m py_compile sources/add2vals.py sources/calc.py' + echo 'Building..' + } + } + stage('Test') { + steps { + echo 'Testing..' + } + } + stage('Deploy') { + steps { + echo 'Deploying....' } } } From 14aba6cb1733c8cd84c1c92df95e937671e0bf50 Mon Sep 17 00:00:00 2001 From: DaWilliam Date: Sun, 4 Mar 2018 00:04:21 -0500 Subject: [PATCH 09/11] Back to original stuff --- Jenkinsfile | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b982250..665eba6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,20 +1,14 @@ pipeline { - agent any - + agent none stages { - stage('Build') { - steps { - echo 'Building..' + stage('Build') { + agent { + docker { + image 'python:2-alpine' + } } - } - stage('Test') { steps { - echo 'Testing..' - } - } - stage('Deploy') { - steps { - echo 'Deploying....' + sh 'python -m py_compile sources/add2vals.py sources/calc.py' } } } From 1dd3187a3659ed47a8717a637bea6021bf85c538 Mon Sep 17 00:00:00 2001 From: DaWilliam Date: Sun, 4 Mar 2018 00:08:08 -0500 Subject: [PATCH 10/11] Second Step --- Jenkinsfile | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 665eba6..ec1cadf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,14 +1,29 @@ pipeline { - agent none + agent none stages { - stage('Build') { + stage('Build') { agent { docker { - image 'python:2-alpine' + image 'python:2-alpine' } } steps { - sh 'python -m py_compile sources/add2vals.py sources/calc.py' + sh 'python -m py_compile sources/add2vals.py sources/calc.py' + } + } + stage('Test') { + agent { + docker { + image 'qnib/pytest' + } + } + steps { + sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py' + } + post { + always { + junit 'test-reports/results.xml' + } } } } From ca8d3cedc4b97cdf09dd743920f84b86d01a1e82 Mon Sep 17 00:00:00 2001 From: DaWilliam Date: Sun, 4 Mar 2018 00:16:49 -0500 Subject: [PATCH 11/11] Third Part --- Jenkinsfile | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ec1cadf..a3f3057 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,18 +11,33 @@ pipeline { sh 'python -m py_compile sources/add2vals.py sources/calc.py' } } - stage('Test') { + stage('Test') { agent { docker { - image 'qnib/pytest' + image 'qnib/pytest' } } steps { - sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py' + sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py' } post { always { - junit 'test-reports/results.xml' + junit 'test-reports/results.xml' + } + } + } + stage('Deliver') { + agent { + docker { + image 'cdrx/pyinstaller-linux:python2' + } + } + steps { + sh 'pyinstaller --onefile sources/add2vals.py' + } + post { + success { + archiveArtifacts 'dist/add2vals' } } }