From a0a041057fe5e2e7db81b1ef655936f38bbb78b0 Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Tue, 16 Nov 2021 23:48:07 -0500 Subject: [PATCH 01/19] Add Jenkinsfile --- Jenkinsfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..68326db --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,16 @@ +pipeline { + agent none //1 + stages { + stage('Build') { //2 + agent { + docker { + image 'python:2-alpine' //3 + } + } + steps { + sh 'python -m py_compile sources/add2vals.py sources/calc.py' //4 + } + } + } +} + From 342c0e0477bd46547c328ad22b2382448c69633f Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Tue, 16 Nov 2021 23:56:56 -0500 Subject: [PATCH 02/19] Add Jenkinsfile --- Jenkinsfile | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 68326db..93796b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,16 +1,45 @@ pipeline { - agent none //1 + agent none stages { - stage('Build') { //2 + stage('Build') { agent { docker { - image 'python:2-alpine' //3 + image 'python:2-alpine' } } steps { - sh 'python -m py_compile sources/add2vals.py sources/calc.py' //4 + 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 bfb0f7ff4d0f169414315bf110ab09dd777a2c50 Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Wed, 17 Nov 2021 00:05:39 -0500 Subject: [PATCH 03/19] Add Jenkinsfile --- Jenkinsfile | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 93796b6..68326db 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,45 +1,16 @@ pipeline { - agent none + agent none //1 stages { - stage('Build') { + stage('Build') { //2 agent { docker { - image 'python:2-alpine' + image 'python:2-alpine' //3 } } 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' //4 } } } } + From 6135c6756d383e8cf0992566c3015ce38295b04f Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Wed, 17 Nov 2021 00:08:16 -0500 Subject: [PATCH 04/19] Add Jenkinsfile --- Jenkinsfile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 68326db..1d4ee0d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,8 +7,19 @@ pipeline { image 'python:2-alpine' //3 } } + stage('Test') { + agent { + docker { + image 'qnib/pytest' + } + } steps { - sh 'python -m py_compile sources/add2vals.py sources/calc.py' //4 + sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py' + } + post { + always { + junit 'test-reports/results.xml' + } } } } From 45a6eb193c6704e023f9ea0c75d9f0872f557462 Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Wed, 17 Nov 2021 00:19:32 -0500 Subject: [PATCH 05/19] Add Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d4ee0d..4d1235c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stage('Build') { //2 agent { docker { - image 'python:2-alpine' //3 + image 'python:3-alpine' //3 } } stage('Test') { From 6f69a872998ab265643a528b81d931c753180bfc Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Wed, 17 Nov 2021 00:36:31 -0500 Subject: [PATCH 06/19] Add Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 4d1235c..8eab5c2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,5 +23,6 @@ pipeline { } } } + } } From 061820190cbdd86ef9acf7af464b21e29419bcbc Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Wed, 17 Nov 2021 00:38:35 -0500 Subject: [PATCH 07/19] Add Jenkinsfile --- Jenkinsfile | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8eab5c2..f4af885 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,28 +1,30 @@ pipeline { - agent none //1 + agent none stages { - stage('Build') { //2 + stage('Build') { agent { docker { - image 'python:3-alpine' //3 - } - } - stage('Test') { - agent { - docker { - image 'qnib/pytest' + image 'python:2-alpine' } } steps { - sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py' + sh 'python -m py_compile sources/add2vals.py sources/calc.py' + } + } + stage('Test') { //1 + agent { + docker { + image 'qnib/pytest' //2 + } + } + steps { + sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py' //3 } post { always { - junit 'test-reports/results.xml' + junit 'test-reports/results.xml' //4 } } } } - } } - From 2c9eb0a342e8e3075ac9ceece09a4c0af61225cb Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Wed, 17 Nov 2021 00:41:51 -0500 Subject: [PATCH 08/19] Add Jenkinsfile --- Jenkinsfile | 77 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 29 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f4af885..53daea7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,30 +1,49 @@ 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') { //1 - agent { - docker { - image 'qnib/pytest' //2 - } - } - steps { - sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py' //3 - } - post { - always { - junit 'test-reports/results.xml' //4 - } - } - } - } -} + agent none + options { + skipStagesAfterUnstable() + } + 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') { //1 + agent { + docker { + image 'cdrx/pyinstaller-linux:python2' //2 + } + } + steps { + sh '/root/.pyenv/shims/pyinstaller --onefile sources/add2vals.py' //3 + } + post { + success { + archiveArtifacts 'dist/add2vals' //4 + } + } + } + } + } + From 2506683b7b744ad381453d456871689d364f6717 Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Wed, 17 Nov 2021 22:39:10 -0500 Subject: [PATCH 09/19] remove Jenkinsfile --- Jenkinsfile | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 53daea7..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,49 +0,0 @@ -pipeline { - agent none - options { - skipStagesAfterUnstable() - } - 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') { //1 - agent { - docker { - image 'cdrx/pyinstaller-linux:python2' //2 - } - } - steps { - sh '/root/.pyenv/shims/pyinstaller --onefile sources/add2vals.py' //3 - } - post { - success { - archiveArtifacts 'dist/add2vals' //4 - } - } - } - } - } - From bea1319e7cf26d5c8098bbf7e547b93be6c90704 Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Wed, 17 Nov 2021 22:41:20 -0500 Subject: [PATCH 10/19] add Jenkinsfile --- Jenkinsfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..68326db --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,16 @@ +pipeline { + agent none //1 + stages { + stage('Build') { //2 + agent { + docker { + image 'python:2-alpine' //3 + } + } + steps { + sh 'python -m py_compile sources/add2vals.py sources/calc.py' //4 + } + } + } +} + From 838dc9b5ec1fb12b1eb753fcc7d4b28ed35b8b03 Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Wed, 17 Nov 2021 22:47:42 -0500 Subject: [PATCH 11/19] mod Jenkinsfile --- Jenkinsfile | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 68326db..2d3e88f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,14 +1,29 @@ pipeline { - agent none //1 + agent none stages { - stage('Build') { //2 + stage('Build') { agent { docker { - image 'python:2-alpine' //3 + image 'python:2-alpine' } } steps { - sh 'python -m py_compile sources/add2vals.py sources/calc.py' //4 + sh 'python -m py_compile sources/add2vals.py sources/calc.py' + } + } + stage('Test') { //1 + agent { + docker { + image 'qnib/pytest' //2 + } + } + steps { + sh 'py.test --verbose --junit-xml test-reports/results.xml sources/test_calc.py' //3 + } + post { + always { + junit 'test-reports/results.xml' //4 + } } } } From 91dc2a9979fdb308deed5d740d3d30909e523031 Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Thu, 18 Nov 2021 00:08:51 -0500 Subject: [PATCH 12/19] add post action with email --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2d3e88f..fe593b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,6 +23,9 @@ pipeline { post { always { junit 'test-reports/results.xml' //4 +           mail to:"buildAdmin@mycompany.com", +          subject:"STATUS FOR PROJECT: ${currentBuild.fullDisplayName}", +          body: "RESULT: ${currentBuild.result}"   } } } From 70989e8021ef9c27ff1c2da9ca26b90d82b67034 Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Thu, 18 Nov 2021 00:11:24 -0500 Subject: [PATCH 13/19] add post action with email --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fe593b0..9490d42 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,7 @@ pipeline { } post { always { - junit 'test-reports/results.xml' //4 -           mail to:"buildAdmin@mycompany.com", +           mail to:"ouaazs@algonquincollege.com",           subject:"STATUS FOR PROJECT: ${currentBuild.fullDisplayName}",           body: "RESULT: ${currentBuild.result}"   } From 00fc0effc18c9561bd4b67143aa16a822d85d160 Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Thu, 18 Nov 2021 00:14:31 -0500 Subject: [PATCH 14/19] add post action with email --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9490d42..3bac794 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,7 @@ pipeline { } post { always { -           mail to:"ouaazs@algonquincollege.com", + mail to:"ouaazs@algonquincollege.com",           subject:"STATUS FOR PROJECT: ${currentBuild.fullDisplayName}",           body: "RESULT: ${currentBuild.result}"   } From 131abf4f46c32ae39cb9373b4027ac7dcb437c9c Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Thu, 18 Nov 2021 00:16:38 -0500 Subject: [PATCH 15/19] add post action with email --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3bac794..67f0e85 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,8 +23,8 @@ pipeline { post { always { mail to:"ouaazs@algonquincollege.com", -          subject:"STATUS FOR PROJECT: ${currentBuild.fullDisplayName}", -          body: "RESULT: ${currentBuild.result}"   + subject:"STATUS FOR PROJECT: ${currentBuild.fullDisplayName}", + body: "RESULT: ${currentBuild.result}"   } } } From 899b2c4e204688b19bd8b69d120a8184b2ff1601 Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Thu, 18 Nov 2021 00:18:22 -0500 Subject: [PATCH 16/19] add post action with email --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 67f0e85..9927d45 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { always { mail to:"ouaazs@algonquincollege.com", subject:"STATUS FOR PROJECT: ${currentBuild.fullDisplayName}", - body: "RESULT: ${currentBuild.result}"   + body: "RESULT: ${currentBuild.result}" } } } From 4bc35d8e50dfb15b1f1a4b63d9634e43165a3dab Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Thu, 18 Nov 2021 00:51:05 -0500 Subject: [PATCH 17/19] remove email --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9927d45..359c543 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,8 @@ pipeline { agent none + // Scan for SCM changes at 10-minute intervals + triggers { pollSCM(*/10 * * * *) } + stages { stage('Build') { agent { @@ -22,9 +25,7 @@ pipeline { } post { always { - mail to:"ouaazs@algonquincollege.com", - subject:"STATUS FOR PROJECT: ${currentBuild.fullDisplayName}", - body: "RESULT: ${currentBuild.result}" + junit 'test-reports/results.xml' } } } From 4ffbb2b1ac27bc11e92903784e4a02008c3cf202 Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Thu, 18 Nov 2021 01:04:44 -0500 Subject: [PATCH 18/19] remove email --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 359c543..1fa5364 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,5 @@ pipeline { agent none - // Scan for SCM changes at 10-minute intervals - triggers { pollSCM(*/10 * * * *) } stages { stage('Build') { From 604c1a036e5aecd9c3f5e4b408271ec6518d13cb Mon Sep 17 00:00:00 2001 From: Samira Ouaaz Date: Thu, 18 Nov 2021 01:08:36 -0500 Subject: [PATCH 19/19] make some changes --- sources/add2vals.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/add2vals.py b/sources/add2vals.py index d671e38..2f78062 100644 --- a/sources/add2vals.py +++ b/sources/add2vals.py @@ -6,6 +6,8 @@ the calc.py library's 'add2' function. import sys import calc +# Some Comment here + argnumbers = len(sys.argv) - 1 if argnumbers == 2 :