From 3dd0bd9a49e971941bc24b11cb4ab1bcb346d862 Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Tue, 4 Oct 2022 15:55:41 -0300 Subject: [PATCH 01/54] adding a readme --- worker/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 worker/README.md diff --git a/worker/README.md b/worker/README.md new file mode 100644 index 0000000000..bde5cde363 --- /dev/null +++ b/worker/README.md @@ -0,0 +1 @@ +## worker java app From 8dde1aaf65a576a0572e68162da6135e1a6f7ffb Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Tue, 4 Oct 2022 15:57:25 -0300 Subject: [PATCH 02/54] hi --- worker/README2.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 worker/README2.md diff --git a/worker/README2.md b/worker/README2.md new file mode 100644 index 0000000000..fcbf1bd05a --- /dev/null +++ b/worker/README2.md @@ -0,0 +1 @@ +## adding a second file From 2695e991b23482129252e6a35a36f2ee309f5912 Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Tue, 4 Oct 2022 16:16:57 -0300 Subject: [PATCH 03/54] adding build status badge --- worker/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/worker/README.md b/worker/README.md index bde5cde363..9a0f883731 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1 +1,6 @@ ## worker java app + + + * Build Status + [![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build)] + (http://157.230.222.153:8080/job/instavote/job/worker-build/) From 90d6536ca719d8dd4294abefa5e3806c4d17b417 Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Tue, 4 Oct 2022 16:20:27 -0300 Subject: [PATCH 04/54] update --- worker/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/worker/README.md b/worker/README.md index 9a0f883731..efee5ddf38 100644 --- a/worker/README.md +++ b/worker/README.md @@ -2,5 +2,4 @@ * Build Status - [![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build)] - (http://157.230.222.153:8080/job/instavote/job/worker-build/) +[![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://157.230.222.153:8080/job/instavote/job/worker-build/) From 75c08f6c1fc9d8e02422911056675a6e75431e1c Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Tue, 4 Oct 2022 16:38:16 -0300 Subject: [PATCH 05/54] added badge for unit test jenkins job --- worker/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worker/README.md b/worker/README.md index efee5ddf38..45280365f2 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1,5 +1,8 @@ ## worker java app - * Build Status + [![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://157.230.222.153:8080/job/instavote/job/worker-build/) + + +[![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fwroker-test&subject=UnitTest)](http://157.230.222.153:8080/job/instavote/job/wroker-test/) From fa66c83b7fc079687220b9c75dc839a8970c1d4b Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Tue, 4 Oct 2022 17:08:48 -0300 Subject: [PATCH 06/54] create READMe.md --- result/README.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 result/README.md diff --git a/result/README.md b/result/README.md new file mode 100644 index 0000000000..415f1ce8ea --- /dev/null +++ b/result/README.md @@ -0,0 +1,6 @@ +## this is a readme file with the Jenkins badges + +for Build +[![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=result-build)](http://157.230.222.153:8080/job/result-build/) +and for Test +[![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=result-test)](http://157.230.222.153:8080/job/result-test/) From b595f365af67b8edba27043071aea1ed1819a53e Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 5 Oct 2022 15:42:12 +0000 Subject: [PATCH 07/54] test --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b8ad8a94af..b2753b6a80 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ Example Voting App ========= + Getting started --------------- From 8bf159cf9b61ce9f67ecec3dfd0dfe8126a7d8ac Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 5 Oct 2022 15:55:42 +0000 Subject: [PATCH 08/54] test --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b2753b6a80..d8cc6e49b8 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ Example Voting App ========= + Getting started --------------- From 155209d34ecd2fcbe990c3d6e36eea782fa066cf Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Wed, 5 Oct 2022 15:58:37 -0300 Subject: [PATCH 09/54] Delete README2.md --- worker/README2.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 worker/README2.md diff --git a/worker/README2.md b/worker/README2.md deleted file mode 100644 index fcbf1bd05a..0000000000 --- a/worker/README2.md +++ /dev/null @@ -1 +0,0 @@ -## adding a second file From e9f7b16632a54403ad1d2e907dba9a57ca06ffe8 Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:02:20 -0300 Subject: [PATCH 10/54] change --- worker/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/worker/README.md b/worker/README.md index 45280365f2..e23715d46d 100644 --- a/worker/README.md +++ b/worker/README.md @@ -2,7 +2,6 @@ -[![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://157.230.222.153:8080/job/instavote/job/worker-build/) - +http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build [![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fwroker-test&subject=UnitTest)](http://157.230.222.153:8080/job/instavote/job/wroker-test/) From ac03f3db43566f12ea43404c4ffff2306f51e0f0 Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:03:08 -0300 Subject: [PATCH 11/54] change --- worker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/README.md b/worker/README.md index e23715d46d..5511b03ef3 100644 --- a/worker/README.md +++ b/worker/README.md @@ -2,6 +2,6 @@ -http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build +[![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://157.230.222.153:8080/job/instavote/job/worker-build/) [![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fwroker-test&subject=UnitTest)](http://157.230.222.153:8080/job/instavote/job/wroker-test/) From 698e3e23971ecce43720cc76f0aa2b953130f9e3 Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:04:01 -0300 Subject: [PATCH 12/54] change --- worker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/README.md b/worker/README.md index 5511b03ef3..000f54ff1a 100644 --- a/worker/README.md +++ b/worker/README.md @@ -2,6 +2,6 @@ -[![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://157.230.222.153:8080/job/instavote/job/worker-build/) +[[image:http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build>>http://157.230.222.153:8080/job/instavote/job/worker-build/||target='__new']] [![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fwroker-test&subject=UnitTest)](http://157.230.222.153:8080/job/instavote/job/wroker-test/) From 14bdb7ee3d363d65875a0aff0c794269a92c325c Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:05:30 -0300 Subject: [PATCH 13/54] change again --- worker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/README.md b/worker/README.md index 000f54ff1a..6837eaaabe 100644 --- a/worker/README.md +++ b/worker/README.md @@ -2,6 +2,6 @@ -[[image:http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build>>http://157.230.222.153:8080/job/instavote/job/worker-build/||target='__new']] +http://157.230.222.153:8080/buildStatus/text?job=instavote%2Fworker-build [![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fwroker-test&subject=UnitTest)](http://157.230.222.153:8080/job/instavote/job/wroker-test/) From 93f4877eda3359ce4b8b06c3c3ea189b7460280d Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:24:34 -0300 Subject: [PATCH 14/54] change again --- worker/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/worker/README.md b/worker/README.md index 6837eaaabe..0507760d3d 100644 --- a/worker/README.md +++ b/worker/README.md @@ -2,6 +2,7 @@ -http://157.230.222.153:8080/buildStatus/text?job=instavote%2Fworker-build +http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build -[![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fwroker-test&subject=UnitTest)](http://157.230.222.153:8080/job/instavote/job/wroker-test/) + +http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fwroker-test From c5a142a34dd24b554d7d430f74ddf30af0956832 Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:27:08 -0300 Subject: [PATCH 15/54] change --- worker/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/worker/README.md b/worker/README.md index 0507760d3d..52e8fcfcdc 100644 --- a/worker/README.md +++ b/worker/README.md @@ -6,3 +6,6 @@ http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fwroker-test + + +http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-package From ce1ed75d22de3f39e86bdbad0587970bc12f9a30 Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:27:39 -0300 Subject: [PATCH 16/54] . --- worker/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/worker/README.md b/worker/README.md index 52e8fcfcdc..2ba4941630 100644 --- a/worker/README.md +++ b/worker/README.md @@ -2,6 +2,7 @@ + http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build From 67f15f4fe5443b3eaae53bd8f9abcc2a342e39e1 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 5 Oct 2022 16:36:28 -0300 Subject: [PATCH 17/54] test --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index d8cc6e49b8..b8ad8a94af 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ Example Voting App ========= - - Getting started --------------- From d5389472afe6d13da198558e73102cf98ba53c11 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 5 Oct 2022 16:39:49 -0300 Subject: [PATCH 18/54] added application info --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b8ad8a94af..a16cbf12f4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Example Voting App ========= +this is a sample isntavote application + Getting started --------------- From 3e9dcdbafe5bbd9a4a0c71296a1f49462a04be35 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 5 Oct 2022 18:31:53 -0300 Subject: [PATCH 19/54] added Jenkinsfile for worker with build job --- worker/Jenkinsfile | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 worker/Jenkinsfile diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile new file mode 100644 index 0000000000..b8740136eb --- /dev/null +++ b/worker/Jenkinsfile @@ -0,0 +1,36 @@ +pipeline { + agent any + + tools{ + maven "maven 3.8.6" + } + stages { + stage('Build') { + steps { + echo 'Compiling worker app' + dir('worker'){ + sh 'mvn compile' + } + } + } + stage('Test') { + steps { + echo 'Running Unit Tests on worker app' + } + } + stage('Package') { + steps { + echo 'Package worker app' + } + } + } + + post { + always{ + echo 'Build pipeline run is completed.' + } + } +} + + + From a55275bb27947b6975482ecdd84597f3021e169e Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 5 Oct 2022 19:18:54 -0300 Subject: [PATCH 20/54] added test and package jobs to worker pipeline --- worker/Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index b8740136eb..1589c50d69 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -16,11 +16,17 @@ pipeline { stage('Test') { steps { echo 'Running Unit Tests on worker app' + dir('worker'){ + sh 'mvn clean test' + } } } stage('Package') { steps { echo 'Package worker app' + dir('worker'){ + sh 'mvn package' + } } } } From 20faff01987ce83c49fcdb604fdd6b05327ad888 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 5 Oct 2022 19:29:59 -0300 Subject: [PATCH 21/54] archive artifacts and skip tests during package --- worker/Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 1589c50d69..5022f7b136 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -25,7 +25,7 @@ pipeline { steps { echo 'Package worker app' dir('worker'){ - sh 'mvn package' + sh 'mvn package -DskipTests' } } } @@ -33,6 +33,7 @@ pipeline { post { always{ + archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true echo 'Build pipeline run is completed.' } } From 314f4f925c9e91621537f892df3ea6c390403adf Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 5 Oct 2022 19:44:18 -0300 Subject: [PATCH 22/54] added some conditions --- worker/Jenkinsfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 5022f7b136..8d8acb8321 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -6,6 +6,9 @@ pipeline { } stages { stage('Build') { + when{ + changeset '**/wroker/**' + } steps { echo 'Compiling worker app' dir('worker'){ @@ -14,6 +17,9 @@ pipeline { } } stage('Test') { + when{ + changeset '**/wroker/**' + } steps { echo 'Running Unit Tests on worker app' dir('worker'){ @@ -22,6 +28,10 @@ pipeline { } } stage('Package') { + when{ + branch 'master' + changeset '**/wroker/**' + } steps { echo 'Package worker app' dir('worker'){ From 5818c54bfc15c00404d7dc89c4d19753835c0b9e Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 5 Oct 2022 19:47:54 -0300 Subject: [PATCH 23/54] added some conditions --- worker/Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 8d8acb8321..bcff54e05d 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { stages { stage('Build') { when{ - changeset '**/wroker/**' + changeset "**/wroker/**" } steps { echo 'Compiling worker app' @@ -18,7 +18,7 @@ pipeline { } stage('Test') { when{ - changeset '**/wroker/**' + changeset "**/wroker/**" } steps { echo 'Running Unit Tests on worker app' @@ -30,7 +30,7 @@ pipeline { stage('Package') { when{ branch 'master' - changeset '**/wroker/**' + changeset "**/wroker/**" } steps { echo 'Package worker app' From 87813c7588cfec4afd09fa3b12a0ee4f992e5055 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 5 Oct 2022 19:52:21 -0300 Subject: [PATCH 24/54] added some conditions --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index bcff54e05d..d1f84b591f 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -36,6 +36,7 @@ pipeline { echo 'Package worker app' dir('worker'){ sh 'mvn package -DskipTests' + archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true } } } @@ -43,7 +44,6 @@ pipeline { post { always{ - archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true echo 'Build pipeline run is completed.' } } From 8adbce1c183377ffb4731668efa91fdf659a55fe Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 5 Oct 2022 19:54:52 -0300 Subject: [PATCH 25/54] corrected wroker to worker --- worker/Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index d1f84b591f..058a6a0153 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { stages { stage('Build') { when{ - changeset "**/wroker/**" + changeset "**/worker/**" } steps { echo 'Compiling worker app' @@ -18,7 +18,7 @@ pipeline { } stage('Test') { when{ - changeset "**/wroker/**" + changeset "**/worker/**" } steps { echo 'Running Unit Tests on worker app' @@ -30,7 +30,7 @@ pipeline { stage('Package') { when{ branch 'master' - changeset "**/wroker/**" + changeset "**/worker/**" } steps { echo 'Package worker app' From 92ead83b2d8a3b2dbe7b999e97ae429c65b1307e Mon Sep 17 00:00:00 2001 From: quieroSer Date: Sun, 9 Oct 2022 11:09:11 -0300 Subject: [PATCH 26/54] added jenkins file for result app --- result/Jenkinsfile | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 result/Jenkinsfile diff --git a/result/Jenkinsfile b/result/Jenkinsfile new file mode 100644 index 0000000000..3a38ecc952 --- /dev/null +++ b/result/Jenkinsfile @@ -0,0 +1,41 @@ +pipeline { + agent any + + tools{ + nodejs "node 8.9.0" + } + stages { + stage('Build') { + when{ + changeset "**/result/**" + } + steps { + echo 'Compiling result app' + dir('result'){ + sh 'npm install' + } + } + } + stage('Test') { + when{ + changeset "**/result/**" + } + steps { + echo 'Running Unit Tests on result app' + dir('result'){ + sh 'npm install' + sh 'npm test' + } + } + } + } + + post { + always{ + echo 'Build pipeline run is completed.' + } + } +} + + + From bb583bfc7116c622074f8e130cd7942bc18046b2 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Sun, 9 Oct 2022 11:22:07 -0300 Subject: [PATCH 27/54] added a 5th mock test --- result/test/mock.test.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/result/test/mock.test.js b/result/test/mock.test.js index f99dfdae97..793ee9f305 100644 --- a/result/test/mock.test.js +++ b/result/test/mock.test.js @@ -26,4 +26,9 @@ describe('mock test 4', () => { }); }); +describe('mock test 5', () => { + it('unit test 5', () => { + expect(true).to.be.true; + }); +}); From 3f59c66aa341ecf4ece91ae9b23db4061154c572 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Sun, 9 Oct 2022 12:32:57 -0300 Subject: [PATCH 28/54] use docker agent instead of maven tools --- worker/Jenkinsfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index b8740136eb..e365dfdc3e 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,9 +1,11 @@ pipeline { - agent any - - tools{ - maven "maven 3.8.6" + agent { + docker{ + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } } + stages { stage('Build') { steps { From 5cfc880443180c3f81eb09fcf25299eec5bb42e3 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Sun, 9 Oct 2022 12:40:18 -0300 Subject: [PATCH 29/54] add one more unit test --- worker/src/test/java/worker/UnitWorker.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/worker/src/test/java/worker/UnitWorker.java b/worker/src/test/java/worker/UnitWorker.java index cb5d513961..3806737025 100644 --- a/worker/src/test/java/worker/UnitWorker.java +++ b/worker/src/test/java/worker/UnitWorker.java @@ -21,5 +21,9 @@ void sample3() { @Test void sample4() { + } + @Test + void sample5() { + } } From f4faa7643e41563bf3b62b9afa953909ddaf0271 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Sun, 9 Oct 2022 13:10:27 -0300 Subject: [PATCH 30/54] changed the result app to use docker instead of the global tools --- result/Jenkinsfile | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 result/Jenkinsfile diff --git a/result/Jenkinsfile b/result/Jenkinsfile new file mode 100644 index 0000000000..3f2083a2a5 --- /dev/null +++ b/result/Jenkinsfile @@ -0,0 +1,42 @@ +pipeline{ + + agent{ + docker{ + image 'node:8.16.0-alpine' + } + } + + + stages{ + stage('build'){ + when{ + changeset "**/result/**" + } + steps{ + echo "compiling result app" + dir('result'){ + sh 'npm install' + } + } + } + + stage('test'){ + when{ + changeset "**/result/**" + } + steps{ + echo 'running unit tests on result app' + dir('result'){ + sh 'npm install' + sh 'npm test' + } + } + } + } + + post{ + always{ + echo 'pipeline for results complete' + } + } +} From d58298ab1c55ba9a570132f2b3b7cd5331193ec0 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Sun, 9 Oct 2022 13:20:28 -0300 Subject: [PATCH 31/54] added jenkis file for vote app pipeline --- vote/Jenkinsfile | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 vote/Jenkinsfile diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile new file mode 100644 index 0000000000..876baa6a57 --- /dev/null +++ b/vote/Jenkinsfile @@ -0,0 +1,41 @@ +pipeline{ + + agent{ + docker{ + image 'python: 2.7.16-slim' + } + } + + + stages{ + stage('build'){ + when{ + changeset "**/vote/**" + } + steps{ + echo "compiling vote app" + dir('vote'){ + sh 'pip install -i requirements.txt' + } + } + } + + stage('test'){ + when{ + changeset "**/vote/**" + } + steps{ + echo 'running unit tests on result app' + dir('vote'){ + sh 'nosetests -v' + } + } + } + } + + post{ + always{ + echo 'pipeline for vote complete' + } + } +} From 2bb4f876fe1581d313c23822e089cc4cfa91b33a Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 12 Oct 2022 19:45:11 +0000 Subject: [PATCH 32/54] added docker package stage --- worker/Jenkinsfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index c7d72a7bb3..f4cc2f95a4 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -29,16 +29,18 @@ pipeline { } } } - stage('Package') { + stage('docker-package') { when{ branch 'master' changeset "**/worker/**" } steps { echo 'Package worker app' - dir('worker'){ - sh 'mvn package -DskipTests' - archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true + script{ + docker.withRegistry('https://index.docker.io/v1', 'dockerhub') { + def testImage = docker.build("donquijotedelasnubes/worker:v$(env.BUILD_ID)", "./worker") + workerImage.push() + } } } } From 6404543128a67c236d89a78c817be7b183040a32 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 12 Oct 2022 19:53:48 +0000 Subject: [PATCH 33/54] corrected a small mistake --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index f4cc2f95a4..083883998c 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -38,7 +38,7 @@ pipeline { echo 'Package worker app' script{ docker.withRegistry('https://index.docker.io/v1', 'dockerhub') { - def testImage = docker.build("donquijotedelasnubes/worker:v$(env.BUILD_ID)", "./worker") + def testImage = docker.build("donquijotedelasnubes/worker:v${env.BUILD_ID}", "./worker") workerImage.push() } } From 3fda3caefe1ff3afe0ce3506c4edd347074a5b3d Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 12 Oct 2022 20:20:10 +0000 Subject: [PATCH 34/54] use per stage specific agent --- worker/Jenkinsfile | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 083883998c..2f339fd04b 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,13 +1,21 @@ pipeline { - agent { +/* agent { docker{ image 'maven:3.6.1-jdk-8-alpine' args '-v $HOME/.m2:/root/.m2' } } +*/ + agent none stages { stage('Build') { + agent { + docker{ + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } when{ changeset "**/worker/**" } @@ -19,6 +27,12 @@ pipeline { } } stage('Test') { + agent { + docker{ + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } when{ changeset "**/worker/**" } @@ -29,7 +43,27 @@ pipeline { } } } + stage('Package'){ + agent { + docker{ + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + when{ + branch 'master' + changeset "**/worker/**" + } + steps{ + echo "package worker app" + dir('worker'){ + sh 'mvn package -DskipTests' + } + } + } + stage('docker-package') { + agent any when{ branch 'master' changeset "**/worker/**" From 32b5fd877376838776b3a4793d22ca7d3419751a Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 12 Oct 2022 22:16:41 +0000 Subject: [PATCH 35/54] made a small change just ot trigger a build --- worker/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/worker/README.md b/worker/README.md index 2ba4941630..c25fb1749c 100644 --- a/worker/README.md +++ b/worker/README.md @@ -3,6 +3,8 @@ + + http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build From b3e19362fc89d6fb26fad6209e4b92c2db717e25 Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Wed, 12 Oct 2022 20:05:43 -0300 Subject: [PATCH 36/54] Create Dockerfile --- worker/Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 worker/Dockerfile diff --git a/worker/Dockerfile b/worker/Dockerfile new file mode 100644 index 0000000000..327a821bc7 --- /dev/null +++ b/worker/Dockerfile @@ -0,0 +1,11 @@ +FROM maven:3.6.1-jdk-8-alpine + +WORKDIR /app + +COPY . . + +RUN maven package -DskipTests && \ + mv target/worker-jar-with-dependencies.jar /run/worker.jar && \ + rm -rf /app/* + +CMD java -jar /run/worker.jar From 44282bc249e3e21ec19ca2848e4f5149a1bade49 Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Wed, 12 Oct 2022 20:09:34 -0300 Subject: [PATCH 37/54] Update Dockerfile --- worker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Dockerfile b/worker/Dockerfile index 327a821bc7..4ae863ce66 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /app COPY . . -RUN maven package -DskipTests && \ +RUN mvn package -DskipTests && \ mv target/worker-jar-with-dependencies.jar /run/worker.jar && \ rm -rf /app/* From 76fda606cfa6d85309b49ed1169bd167560fc10c Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Wed, 12 Oct 2022 20:21:22 -0300 Subject: [PATCH 38/54] Update Jenkinsfile --- worker/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 2f339fd04b..f5d49b2e4f 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -71,8 +71,8 @@ pipeline { steps { echo 'Package worker app' script{ - docker.withRegistry('https://index.docker.io/v1', 'dockerhub') { - def testImage = docker.build("donquijotedelasnubes/worker:v${env.BUILD_ID}", "./worker") + docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { + def workerImage = docker.build("donquijotedelasnubes/worker:v${env.BUILD_ID}", "./worker") workerImage.push() } } From 55307de62609b0194cc52076c48e6c892b4cebd8 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 12 Oct 2022 23:33:35 +0000 Subject: [PATCH 39/54] add another push with branch name --- worker/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index f5d49b2e4f..0612f4f17d 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -74,6 +74,7 @@ pipeline { docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { def workerImage = docker.build("donquijotedelasnubes/worker:v${env.BUILD_ID}", "./worker") workerImage.push() + workerImage.push("${env.BRANCH_NAME}") } } } From 62e7154290afe3c0a0c611eaab50875efaceff41 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Thu, 13 Oct 2022 12:41:18 +0000 Subject: [PATCH 40/54] update jenkins file for vote and result app --- result/Jenkinsfile | 71 ++++++++++++++++++++++++++++++++++++++++++++++ vote/Jenkinsfile | 32 +++++++++++++++++++-- 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index e69de29bb2..1e636841ea 100644 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -0,0 +1,71 @@ +pipeline{ +/* + agent{ + docker{ + image 'python: 2.7.16-slim' + } + } +*/ + agent none + + stages{ + stage('build'){ + agent{ + docker{ + image 'node:8.16.0-alpine' + } + } + when{ + changeset "**/result/**" + } + steps{ + echo "compiling result app" + dir('result'){ + sh 'npm install' + } + } + } + + stage('test'){ + agent{ + docker{ + image 'node:8.16.0-alpine' + } + } + when{ + changeset "**/result/**" + } + steps{ + echo 'running unit tests on result app' + dir('result'){ + sh 'npm install' + sh 'npm test' + } + } + } + stage('docker-package') { + agent any + when{ + branch 'master' + changeset "**/result/**" + } + steps { + echo 'Package result app' + script{ + docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { + def resultImage = docker.build("donquijotedelasnubes/result:v${env.BUILD_ID}", "./result") + resultImage.push() + resultImage.push("${env.BRANCH_NAME}") + } + } + } + + } + + post{ + always{ + echo 'pipeline for result complete' + } + } +} + diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index 876baa6a57..e1dec3e004 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -1,14 +1,20 @@ pipeline{ - +/* agent{ docker{ image 'python: 2.7.16-slim' } } - +*/ + agent none stages{ stage('build'){ + agent{ + docker{ + image 'python: 2.7.16-slim' + } + } when{ changeset "**/vote/**" } @@ -21,6 +27,11 @@ pipeline{ } stage('test'){ + agent{ + docker{ + image 'python: 2.7.16-slim' + } + } when{ changeset "**/vote/**" } @@ -31,6 +42,23 @@ pipeline{ } } } + stage('docker-package') { + agent any + when{ + branch 'master' + changeset "**/vote/**" + } + steps { + echo 'Package vote app' + script{ + docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { + def voteImage = docker.build("donquijotedelasnubes/vote:v${env.BUILD_ID}", "./vote") + voteImage.push() + voteImage.push("${env.BRANCH_NAME}") + } + } + } + } post{ From 1d11279ec5c5c6442c1d2466aad39b4cd9eab2e8 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Thu, 13 Oct 2022 12:57:34 +0000 Subject: [PATCH 41/54] corrected some mistakes --- result/Jenkinsfile | 14 +++----------- vote/Jenkinsfile | 12 +++--------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index 1e636841ea..6bd4197069 100644 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -1,11 +1,4 @@ pipeline{ -/* - agent{ - docker{ - image 'python: 2.7.16-slim' - } - } -*/ agent none stages{ @@ -59,13 +52,12 @@ pipeline{ } } } - } post{ - always{ - echo 'pipeline for result complete' + always{ + echo 'pipeline for result complete' + } } } } - diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index e1dec3e004..cc3fbf7853 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -1,11 +1,4 @@ pipeline{ -/* - agent{ - docker{ - image 'python: 2.7.16-slim' - } - } -*/ agent none stages{ @@ -62,8 +55,9 @@ pipeline{ } post{ - always{ - echo 'pipeline for vote complete' + always{ + echo 'pipeline for vote complete' + } } } } From 03063cdcf26587b7df96501955e813020d9fedb7 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Thu, 13 Oct 2022 13:02:35 +0000 Subject: [PATCH 42/54] corrected some mistakes --- result/Jenkinsfile | 2 +- vote/Jenkinsfile | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index 6bd4197069..7b4b14ff6a 100644 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -52,8 +52,8 @@ pipeline{ } } } + } } - post{ always{ echo 'pipeline for result complete' diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index cc3fbf7853..30074913bf 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -51,9 +51,8 @@ pipeline{ } } } - + } } - post{ always{ echo 'pipeline for vote complete' From 1f42ef51b84ceb592bc6dfa2dbcdee8c08000cf0 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Thu, 13 Oct 2022 13:04:40 +0000 Subject: [PATCH 43/54] corrected other mistakes --- result/Jenkinsfile | 2 +- vote/Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index 7b4b14ff6a..ef32fa4c9b 100644 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -59,5 +59,5 @@ pipeline{ echo 'pipeline for result complete' } } - } } + diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index 30074913bf..79739353ea 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -58,5 +58,5 @@ pipeline{ echo 'pipeline for vote complete' } } - } } + From 9aaa307da26f2c97c1c6e71175789cb64a6401d6 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Thu, 13 Oct 2022 18:27:00 +0000 Subject: [PATCH 44/54] modified readme file --- result/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/result/README.md b/result/README.md index 415f1ce8ea..253f60db67 100644 --- a/result/README.md +++ b/result/README.md @@ -1,5 +1,7 @@ ## this is a readme file with the Jenkins badges + + for Build [![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=result-build)](http://157.230.222.153:8080/job/result-build/) and for Test From 9cd675cead0acd209fc6429158469675a7691adf Mon Sep 17 00:00:00 2001 From: quieroSer Date: Thu, 13 Oct 2022 18:34:10 +0000 Subject: [PATCH 45/54] added readme file for vote app --- vote/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 vote/README.md diff --git a/vote/README.md b/vote/README.md new file mode 100644 index 0000000000..253f60db67 --- /dev/null +++ b/vote/README.md @@ -0,0 +1,8 @@ +## this is a readme file with the Jenkins badges + + + +for Build +[![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=result-build)](http://157.230.222.153:8080/job/result-build/) +and for Test +[![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=result-test)](http://157.230.222.153:8080/job/result-test/) From b4b40fe113ffb6948f44f06d44226034c89c13d8 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Thu, 13 Oct 2022 18:50:19 +0000 Subject: [PATCH 46/54] corrected some mistakes in the vote app Jenkinsfile --- vote/Jenkinsfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index 79739353ea..48a7f77e32 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -5,7 +5,8 @@ pipeline{ stage('build'){ agent{ docker{ - image 'python: 2.7.16-slim' + image 'python:2.7.16-slim' + args '--user root' } } when{ @@ -14,7 +15,7 @@ pipeline{ steps{ echo "compiling vote app" dir('vote'){ - sh 'pip install -i requirements.txt' + sh 'pip install -r requirements.txt' } } } @@ -22,7 +23,8 @@ pipeline{ stage('test'){ agent{ docker{ - image 'python: 2.7.16-slim' + image 'python:2.7.16-slim' + args '--user root' } } when{ @@ -31,6 +33,7 @@ pipeline{ steps{ echo 'running unit tests on result app' dir('vote'){ + sh 'pip install -r requirements.txt' sh 'nosetests -v' } } From d40670833ef36740101b6c55ec985da0a0109c17 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Mon, 17 Oct 2022 21:33:16 +0000 Subject: [PATCH 47/54] commit jenkinsfile for the whole project and docker-compose file --- Jenkinsfile | 187 ++++++++++++++++++++++++++++++++++++++++++++ docker-compose.yaml | 50 ++++++++++++ 2 files changed, 237 insertions(+) create mode 100644 Jenkinsfile create mode 100644 docker-compose.yaml diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..3ac0e713a8 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,187 @@ +pipeline { + + agent none + + stages { + stage('Build') { + agent { + docker{ + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + when{ + changeset "**/worker/**" + } + steps { + echo 'Compiling worker app' + dir('worker'){ + sh 'mvn compile' + } + } + } + stage('Test') { + agent { + docker{ + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + when{ + changeset "**/worker/**" + } + steps { + echo 'Running Unit Tests on worker app' + dir('worker'){ + sh 'mvn clean test' + } + } + } + stage('Package'){ + agent { + docker{ + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + when{ + branch 'master' + changeset "**/worker/**" + } + steps{ + echo "package worker app" + dir('worker'){ + sh 'mvn package -DskipTests' + } + } + } + + stage('docker-package') { + agent any + when{ + branch 'master' + changeset "**/worker/**" + } + steps { + echo 'Package worker app' + script{ + docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { + def workerImage = docker.build("donquijotedelasnubes/worker:v${env.BUILD_ID}", "./worker") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + } + } + } + } + + stage('build'){ + agent{ + docker{ + image 'node:8.16.0-alpine' + } + } + when{ + changeset "**/result/**" + } + steps{ + echo "compiling result app" + dir('result'){ + sh 'npm install' + } + } + } + + stage('test'){ + agent{ + docker{ + image 'node:8.16.0-alpine' + } + } + when{ + changeset "**/result/**" + } + steps{ + echo 'running unit tests on result app' + dir('result'){ + sh 'npm install' + sh 'npm test' + } + } + } + stage('docker-package') { + agent any + when{ + branch 'master' + changeset "**/result/**" + } + steps { + echo 'Package result app' + script{ + docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { + def resultImage = docker.build("donquijotedelasnubes/result:v${env.BUILD_ID}", "./result") + resultImage.push() + resultImage.push("${env.BRANCH_NAME}") + } + } + } + } + stage('build'){ + agent{ + docker{ + image 'python:2.7.16-slim' + args '--user root' + } + } + when{ + changeset "**/vote/**" + } + steps{ + echo "compiling vote app" + dir('vote'){ + sh 'pip install -r requirements.txt' + } + } + } + stage('test'){ + agent{ + docker{ + image 'python:2.7.16-slim' + args '--user root' + } + } + when{ + changeset "**/vote/**" + } + steps{ + echo 'running unit tests on result app' + dir('vote'){ + sh 'pip install -r requirements.txt' + sh 'nosetests -v' + } + } + } + stage('docker-package') { + agent any + when{ + branch 'master' + changeset "**/vote/**" + } + steps { + echo 'Package vote app' + script{ + docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { + def voteImage = docker.build("donquijotedelasnubes/vote:v${env.BUILD_ID}", "./vote") + voteImage.push() + voteImage.push("${env.BRANCH_NAME}") + } + } + } + } + } + post{ + always{ + echo 'pipeline for end to end application complete' + } + } +} + diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000000..0ed1300894 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,50 @@ +version: "3.7" + +volumes: + db-data: + +networks: + instavote: + driver: bridge + +services: + vote: + image: donquijotedelasnubes/vote:master + ports: + - 5045:80 + depends_on: + - redis + networks: + - instavote + + redis: + image: redis:alpine + networks: + - instavote + + db: + image: postgres:9.4 + volumes: + - "db-data:/var/lib/postgresql/data" + environment: + POSTGRES_HOST_AUTH_METHOD: trust + networks: + - instavote + + + result: + image: donquijotedelasnubes/result:master + ports: + - 5046:4000 + depends_on: + - db + networks: + - instavote + + worker: + image: donquijotedelasnubes/worker:master + depends_on: + - redis + - db + networks: + - instavote From 8fa746faba8e322ae98fbae279017fcabf2af199 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Mon, 17 Oct 2022 22:09:19 +0000 Subject: [PATCH 48/54] updated some minor mistakes --- Jenkinsfile | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3ac0e713a8..006d2a2227 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ pipeline { agent none stages { - stage('Build') { + stage('worker Build') { agent { docker{ image 'maven:3.6.1-jdk-8-alpine' @@ -20,7 +20,7 @@ pipeline { } } } - stage('Test') { + stage('worker Test') { agent { docker{ image 'maven:3.6.1-jdk-8-alpine' @@ -37,7 +37,7 @@ pipeline { } } } - stage('Package'){ + stage('worker Package'){ agent { docker{ image 'maven:3.6.1-jdk-8-alpine' @@ -56,7 +56,7 @@ pipeline { } } - stage('docker-package') { + stage('worker docker-package') { agent any when{ branch 'master' @@ -73,8 +73,7 @@ pipeline { } } } - - stage('build'){ + stage('result build'){ agent{ docker{ image 'node:8.16.0-alpine' @@ -90,8 +89,7 @@ pipeline { } } } - - stage('test'){ + stage('result test'){ agent{ docker{ image 'node:8.16.0-alpine' @@ -108,7 +106,7 @@ pipeline { } } } - stage('docker-package') { + stage('result docker-package') { agent any when{ branch 'master' @@ -125,7 +123,7 @@ pipeline { } } } - stage('build'){ + stage('vote build'){ agent{ docker{ image 'python:2.7.16-slim' @@ -142,7 +140,7 @@ pipeline { } } } - stage('test'){ + stage('vote test'){ agent{ docker{ image 'python:2.7.16-slim' @@ -160,7 +158,7 @@ pipeline { } } } - stage('docker-package') { + stage('vote docker-package') { agent any when{ branch 'master' From 84da7e7694f5d804c65bb9aaac09ea4f3eea1fd6 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Mon, 17 Oct 2022 23:18:00 +0000 Subject: [PATCH 49/54] did some minor changes to trigger a new build --- result/README.md | 1 - worker/README.md | 2 -- 2 files changed, 3 deletions(-) diff --git a/result/README.md b/result/README.md index 253f60db67..8fde400f42 100644 --- a/result/README.md +++ b/result/README.md @@ -1,7 +1,6 @@ ## this is a readme file with the Jenkins badges - for Build [![Build Status](http://157.230.222.153:8080/buildStatus/icon?job=result-build)](http://157.230.222.153:8080/job/result-build/) and for Test diff --git a/worker/README.md b/worker/README.md index c25fb1749c..2ba4941630 100644 --- a/worker/README.md +++ b/worker/README.md @@ -3,8 +3,6 @@ - - http://157.230.222.153:8080/buildStatus/icon?job=instavote%2Fworker-build From 4088a9b00bb6057142209acdec2f92c5afae6997 Mon Sep 17 00:00:00 2001 From: javier <74383159+quieroSer@users.noreply.github.com> Date: Mon, 17 Oct 2022 20:26:36 -0300 Subject: [PATCH 50/54] new stage to deploy to dev --- Jenkinsfile | 375 ++++++++++++++++++++++++++++------------------------ 1 file changed, 203 insertions(+), 172 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 006d2a2227..5aefd96d9d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,185 +1,216 @@ pipeline { + agent none + stages { + stage('worker Build') { + agent { + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } - agent none - - stages { - stage('worker Build') { - agent { - docker{ - image 'maven:3.6.1-jdk-8-alpine' - args '-v $HOME/.m2:/root/.m2' - } - } - when{ - changeset "**/worker/**" - } - steps { - echo 'Compiling worker app' - dir('worker'){ - sh 'mvn compile' - } - } - } - stage('worker Test') { - agent { - docker{ - image 'maven:3.6.1-jdk-8-alpine' - args '-v $HOME/.m2:/root/.m2' - } - } - when{ - changeset "**/worker/**" - } - steps { - echo 'Running Unit Tests on worker app' - dir('worker'){ - sh 'mvn clean test' - } - } - } - stage('worker Package'){ - agent { - docker{ - image 'maven:3.6.1-jdk-8-alpine' - args '-v $HOME/.m2:/root/.m2' - } - } - when{ - branch 'master' - changeset "**/worker/**" - } - steps{ - echo "package worker app" - dir('worker'){ - sh 'mvn package -DskipTests' - } - } - } - - stage('worker docker-package') { - agent any - when{ - branch 'master' - changeset "**/worker/**" - } - steps { - echo 'Package worker app' - script{ - docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { - def workerImage = docker.build("donquijotedelasnubes/worker:v${env.BUILD_ID}", "./worker") - workerImage.push() - workerImage.push("${env.BRANCH_NAME}") - } - } - } - } - stage('result build'){ - agent{ - docker{ - image 'node:8.16.0-alpine' - } - } - when{ - changeset "**/result/**" - } - steps{ - echo "compiling result app" - dir('result'){ - sh 'npm install' - } - } + } + when { + changeset '**/worker/**' + } + steps { + echo 'Compiling worker app' + dir(path: 'worker') { + sh 'mvn compile' } - stage('result test'){ - agent{ - docker{ - image 'node:8.16.0-alpine' - } - } - when{ - changeset "**/result/**" - } - steps{ - echo 'running unit tests on result app' - dir('result'){ - sh 'npm install' - sh 'npm test' - } - } + + } + } + + stage('worker Test') { + agent { + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' } - stage('result docker-package') { - agent any - when{ - branch 'master' - changeset "**/result/**" - } - steps { - echo 'Package result app' - script{ - docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { - def resultImage = docker.build("donquijotedelasnubes/result:v${env.BUILD_ID}", "./result") - resultImage.push() - resultImage.push("${env.BRANCH_NAME}") - } - } - } - } - stage('vote build'){ - agent{ - docker{ - image 'python:2.7.16-slim' - args '--user root' - } - } - when{ - changeset "**/vote/**" - } - steps{ - echo "compiling vote app" - dir('vote'){ - sh 'pip install -r requirements.txt' - } - } + + } + when { + changeset '**/worker/**' + } + steps { + echo 'Running Unit Tests on worker app' + dir(path: 'worker') { + sh 'mvn clean test' } - stage('vote test'){ - agent{ - docker{ - image 'python:2.7.16-slim' - args '--user root' - } - } - when{ - changeset "**/vote/**" + + } + } + + stage('worker Package') { + agent { + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + + } + when { + branch 'master' + changeset '**/worker/**' + } + steps { + echo 'package worker app' + dir(path: 'worker') { + sh 'mvn package -DskipTests' + } + + } + } + + stage('worker docker-package') { + agent any + when { + branch 'master' + changeset '**/worker/**' + } + steps { + echo 'Package worker app' + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { + def workerImage = docker.build("donquijotedelasnubes/worker:v${env.BUILD_ID}", "./worker") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") } - steps{ - echo 'running unit tests on result app' - dir('vote'){ - sh 'pip install -r requirements.txt' - sh 'nosetests -v' - } + } + + } + } + + stage('result build') { + agent { + docker { + image 'node:8.16.0-alpine' + } + + } + when { + changeset '**/result/**' + } + steps { + echo 'compiling result app' + dir(path: 'result') { + sh 'npm install' + } + + } + } + + stage('result test') { + agent { + docker { + image 'node:8.16.0-alpine' + } + + } + when { + changeset '**/result/**' + } + steps { + echo 'running unit tests on result app' + dir(path: 'result') { + sh 'npm install' + sh 'npm test' + } + + } + } + + stage('result docker-package') { + agent any + when { + branch 'master' + changeset '**/result/**' + } + steps { + echo 'Package result app' + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { + def resultImage = docker.build("donquijotedelasnubes/result:v${env.BUILD_ID}", "./result") + resultImage.push() + resultImage.push("${env.BRANCH_NAME}") } } - stage('vote docker-package') { - agent any - when{ - branch 'master' - changeset "**/vote/**" - } - steps { - echo 'Package vote app' - script{ - docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { - def voteImage = docker.build("donquijotedelasnubes/vote:v${env.BUILD_ID}", "./vote") - voteImage.push() - voteImage.push("${env.BRANCH_NAME}") - } - } - } + + } + } + + stage('vote build') { + agent { + docker { + image 'python:2.7.16-slim' + args '--user root' + } + + } + when { + changeset '**/vote/**' + } + steps { + echo 'compiling vote app' + dir(path: 'vote') { + sh 'pip install -r requirements.txt' } + + } + } + + stage('vote test') { + agent { + docker { + image 'python:2.7.16-slim' + args '--user root' + } + + } + when { + changeset '**/vote/**' + } + steps { + echo 'running unit tests on result app' + dir(path: 'vote') { + sh 'pip install -r requirements.txt' + sh 'nosetests -v' + } + + } } - post{ - always{ - echo 'pipeline for end to end application complete' + + stage('vote docker-package') { + agent any + when { + branch 'master' + changeset '**/vote/**' + } + steps { + echo 'Package vote app' + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') { + def voteImage = docker.build("donquijotedelasnubes/vote:v${env.BUILD_ID}", "./vote") + voteImage.push() + voteImage.push("${env.BRANCH_NAME}") } } -} + } + } + + stage('depoly to dev') { + agent any + steps { + sh 'docker-compose up -d' + } + } + + } + post { + always { + echo 'pipeline for end to end application complete' + } + + } +} \ No newline at end of file From dfdd2e7b5f4f7c32317be2158ba2e27645365500 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Mon, 17 Oct 2022 23:58:38 +0000 Subject: [PATCH 51/54] run deploy to dev only on master --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5aefd96d9d..4f4eb49e5c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -201,6 +201,9 @@ pipeline { stage('depoly to dev') { agent any + when { + branch 'master' + } steps { sh 'docker-compose up -d' } @@ -213,4 +216,4 @@ pipeline { } } -} \ No newline at end of file +} From a752e96742f657387a4598a5a39ab44f1bcb14e7 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 19 Oct 2022 16:35:01 +0000 Subject: [PATCH 52/54] added a sonar qube scanning and project stages --- Jenkinsfile | 33 +++++++++++++++++++++++++++++++++ sonar-project.properties | 4 ++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4f4eb49e5c..fa051a0039 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -199,6 +199,39 @@ pipeline { } } + stage('Sonarqube') { + agent any +/* when{ + branch 'master' + } +*/ + tools { + jdk "JDK11" // the name you have given the JDK installation in Global Tool Configuration + } + + environment{ + sonarpath = tool 'SonarScanner' + } + + steps { + echo 'Running Sonarqube Analysis..' + withSonarQubeEnv('sonar-instavote') { + sh "${sonarpath}/bin/sonar-scanner -Dproject.settings=sonar-project.properties -Dorg.jenkinsci.plugins.durabletask.BourneShellScript.HEARTBEAT_CHECK_INTERVAL=86400" + } + } + } + + + stage("Quality Gate") { + steps { + timeout(time: 1, unit: 'HOURS') { + // Parameter indicates whether to set pipeline to UNSTABLE if Quality Gate fails + // true = set pipeline to UNSTABLE, false = don't + waitForQualityGate abortPipeline: true + } + } + } + stage('depoly to dev') { agent any when { diff --git a/sonar-project.properties b/sonar-project.properties index fa91ad96cc..c9b3ce533e 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,6 +1,6 @@ # Uncomment and update Org matching your configurations on Sonarcloud -#sonar.organization=your-org -sonar.projectKey=your-org_example-voting-app +sonar.organization=quieroser +sonar.projectKey=quieroSer_example-voting-app sonar.projectName=Instavote AIO sonar.projectVersion=1.0 # Comma-separated paths to directories with sources (required) From 0080eaddebe1d7a5d4b4dcbe651b52bc0e3913e3 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Wed, 19 Oct 2022 23:55:51 +0000 Subject: [PATCH 53/54] integration test for vote app --- vote/Jenkinsfile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index 48a7f77e32..a3b046b84b 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -31,13 +31,25 @@ pipeline{ changeset "**/vote/**" } steps{ - echo 'running unit tests on result app' + echo 'running unit tests on vote app' dir('vote'){ sh 'pip install -r requirements.txt' sh 'nosetests -v' } } } + stage('vote integration'){ + agent any + when{ + changeset "**/vote/**" + branch 'master' + } + steps{ + echo 'running integration tests on vote app' + dir('vote'){ + sh 'integration_test.sh' + } + } stage('docker-package') { agent any when{ From c59bb16a3805071b54257548d53d08af3a98cc28 Mon Sep 17 00:00:00 2001 From: quieroSer Date: Fri, 21 Oct 2022 16:48:41 +0000 Subject: [PATCH 54/54] fuck this course --- Jenkinsfile | 3 ++- e2e/.env | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fa051a0039..05b469c74b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -223,8 +223,9 @@ pipeline { stage("Quality Gate") { + agent any steps { - timeout(time: 1, unit: 'HOURS') { + timeout(time: 5, unit: 'MINUTES') { // Parameter indicates whether to set pipeline to UNSTABLE if Quality Gate fails // true = set pipeline to UNSTABLE, false = don't waitForQualityGate abortPipeline: true diff --git a/e2e/.env b/e2e/.env index ba78b2ea4c..99a4f7e2cf 100644 --- a/e2e/.env +++ b/e2e/.env @@ -1,3 +1,3 @@ -VOTE_IMAGE=lfs261/vote:master -WORKER_IMAGE=lfs261/worker:master -RESULT_IMAGE=lfs261/result:master +VOTE_IMAGE=donquijotedelasnubes/vote:master +WORKER_IMAGE=donquijotedelasnubes/worker:master +RESULT_IMAGE=donquijotedelasnubes/result:master