From 036afef0261b53c342d145c8e081b72264c27fbe Mon Sep 17 00:00:00 2001 From: cziaul Date: Fri, 2 Oct 2020 16:33:14 -0500 Subject: [PATCH 01/54] adding 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..671b406a78 --- /dev/null +++ b/worker/README.md @@ -0,0 +1 @@ +## Wroker Java App From 4f62a50b05dce9e729c785bb6481a51a6efe9298 Mon Sep 17 00:00:00 2001 From: cziaul Date: Fri, 2 Oct 2020 16:35:38 -0500 Subject: [PATCH 02/54] adding test --- worker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/README.md b/worker/README.md index 671b406a78..f83acdbb59 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1 +1 @@ -## Wroker Java App +## Wroker Java App Test From bab13915abd7bb0ed1af0ca4740835fccf9d7fa1 Mon Sep 17 00:00:00 2001 From: cziaul Date: Fri, 2 Oct 2020 16:37:18 -0500 Subject: [PATCH 03/54] added test1 --- worker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/README.md b/worker/README.md index f83acdbb59..e8e362adde 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1 +1 @@ -## Wroker Java App Test +## Wroker Java App Test1 From e61f5bdc997c35d3d6f55536ec9a43083e78bbf4 Mon Sep 17 00:00:00 2001 From: cziaul Date: Sat, 3 Oct 2020 14:56:13 -0500 Subject: [PATCH 04/54] test2 --- worker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/README.md b/worker/README.md index e8e362adde..bf10a0980f 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1 +1 @@ -## Wroker Java App Test1 +## Wroker Java App Test2 From 7ae0128099c08cdb9748011a9ccd813cbcd6cf82 Mon Sep 17 00:00:00 2001 From: cziaul Date: Sat, 3 Oct 2020 14:59:05 -0500 Subject: [PATCH 05/54] This is a test Readme1 --- README1.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README1.md diff --git a/README1.md b/README1.md new file mode 100644 index 0000000000..c189f9b8ec --- /dev/null +++ b/README1.md @@ -0,0 +1 @@ +This is a test Readme1 From aaaf816114d64ffc59f4d90d82532e16fa49704d Mon Sep 17 00:00:00 2001 From: cziaul Date: Sat, 3 Oct 2020 15:03:48 -0500 Subject: [PATCH 06/54] Test Readme2 --- README1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README1.md b/README1.md index c189f9b8ec..b6116239d3 100644 --- a/README1.md +++ b/README1.md @@ -1 +1 @@ -This is a test Readme1 +This is a test Readme2 From a3740234cd915e15e3f4c1358812b2aca66fac95 Mon Sep 17 00:00:00 2001 From: cziaul Date: Sat, 3 Oct 2020 15:43:46 -0500 Subject: [PATCH 07/54] adding build status badge --- worker/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/worker/README.md b/worker/README.md index bf10a0980f..11fd93e32d 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1 +1,3 @@ ## Wroker Java App Test2 +*Build Status +[![Build Status](http://10.0.0.144:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://10.0.0.144:8080/job/instavote/job/worker-build/) From 1057fe7025342458bafee85c7f2cf0b0450cdac3 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Mon, 5 Oct 2020 20:29:07 -0700 Subject: [PATCH 08/54] added application info --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b8ad8a94af..33b08e0d43 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Example Voting App ========= +This is a sample instavote application. + Getting started --------------- From 8c9ac5908d6f548bf8cbf217dc6286b98a1c75ce Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 6 Oct 2020 20:17:33 -0700 Subject: [PATCH 09/54] added Jenkinsfile for worker with build job --- worker/Jenkinsfile | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 worker/Jenkinsfile diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile new file mode 100644 index 0000000000..c54d7e450f --- /dev/null +++ b/worker/Jenkinsfile @@ -0,0 +1,35 @@ +pipeline { + agent any + + tools{ + maven 'Maven 3.6.3' + } + + stages { + stage('build') { + steps{ + echo "Compiling worker app" + dir('worker'){ + sh 'mvn compile' + } + } + } + stage('test') { + steps{ + echo "Running Unit Tests on worker app" + sleep 9 + } + } + stage('package') { + steps{ + echo "Packaging worker app" + sleep 5 + } + } + } + post{ + always{ + echo "Build pipeline for worker is completed.." + } + } +} From 9cbf77e5e41362afeaa02cb431cf001d9ceb6dcf Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Wed, 7 Oct 2020 14:44:50 -0700 Subject: [PATCH 10/54] webhook test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 33b08e0d43..6f8b4fd6f5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Example Voting App ========= -This is a sample instavote application. +This is a sample testing webhook Getting started --------------- From 32b5c9184d8d94a31149a65ec3ae50771b06733f Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Wed, 7 Oct 2020 15:00:56 -0700 Subject: [PATCH 11/54] webhook testy --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f8b4fd6f5..eff33c78fe 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Example Voting App ========= -This is a sample testing webhook +This is a sample testing webhook testy Getting started --------------- From 5826b74fb2e2a76beb0fdaf1d6c8bca58af66b2f Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Wed, 7 Oct 2020 15:52:54 -0700 Subject: [PATCH 12/54] adding webhook --- worker/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/worker/README.md b/worker/README.md index 11fd93e32d..3cb975c1a6 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1,3 +1,8 @@ ## Wroker Java App Test2 *Build Status [![Build Status](http://10.0.0.144:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://10.0.0.144:8080/job/instavote/job/worker-build/) + +*Build Status by smee +[![Build Status](https://smee.io/mM7UhZMm1usCWU/buildStatus/icon?job=instavote%2Fworker-build)](https://smee.io/mM7UhZMm1usCWU/job/instavote/job/worker-build/) + + From 6e24c7403eb8ae7b531958b43eda462b0c3f858c Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Thu, 8 Oct 2020 14:35:06 -0700 Subject: [PATCH 13/54] added Jenkinsfile for worker with build job --- worker/Jenkinsfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index c54d7e450f..7d4a03f594 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -17,19 +17,24 @@ pipeline { stage('test') { steps{ echo "Running Unit Tests on worker app" - sleep 9 + dir('worker'){ + sh 'mvn clean test' + } + } } stage('package') { steps{ echo "Packaging worker app" - sleep 5 + dir('worker'){ + sh 'mvn package' + } } } } post{ always{ - echo "Build pipeline for worker is completed.." + echo "Pipeline for worker is completed.." } } } From d8406fa642d84b370bf714ff753eaeaf6d2a578d Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Thu, 8 Oct 2020 15:07:22 -0700 Subject: [PATCH 14/54] archive artifacts, skip tests while packaging --- worker/Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 7d4a03f594..18a3a18ca3 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -27,13 +27,14 @@ pipeline { steps{ echo "Packaging worker app" dir('worker'){ - sh 'mvn package' + sh 'mvn package -DskipTests' } } } } post{ always{ + archiveArtifacts artifacts: '**/target/*.jar' fingerprint: true echo "Pipeline for worker is completed.." } } From a4018fb004bc4c2fa34d895a16257b13a999e840 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Thu, 8 Oct 2020 15:13:53 -0700 Subject: [PATCH 15/54] added missing comma --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 18a3a18ca3..56dec4fd37 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -34,7 +34,7 @@ pipeline { } post{ always{ - archiveArtifacts artifacts: '**/target/*.jar' fingerprint: true + archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true echo "Pipeline for worker is completed.." } } From 1f68b5b65aa7cb74a99057bda3299f1e67817a1c Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Thu, 8 Oct 2020 18:06:34 -0700 Subject: [PATCH 16/54] run packaging step only on master, run stages only when worker code changes --- worker/Jenkinsfile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 56dec4fd37..281d78e57b 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -7,6 +7,9 @@ pipeline { stages { stage('build') { + when{ + changeset "**/worker/**" + } steps{ echo "Compiling worker app" dir('worker'){ @@ -15,6 +18,9 @@ pipeline { } } stage('test') { + when{ + changeset "**/worker/**" + } steps{ echo "Running Unit Tests on worker app" dir('worker'){ @@ -24,17 +30,22 @@ pipeline { } } stage('package') { + when{ + branch 'master' + changeset "**/worker/**" + } steps{ echo "Packaging worker app" dir('worker'){ sh 'mvn package -DskipTests' + archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true } } } } post{ always{ - archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true + echo "Pipeline for worker is completed.." } } From 675787b857d6c61b381ff71f23912a49efd6d19d Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Fri, 9 Oct 2020 12:56:30 -0700 Subject: [PATCH 17/54] added slack failure and sucess notifications --- worker/Jenkinsfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 281d78e57b..77de096f03 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -45,8 +45,14 @@ pipeline { } post{ always{ - echo "Pipeline for worker is completed.." } + failure{ + slackSend(channel: "#jenkinswithslack", message: "Build Failed - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") + } + success{ + slackSend(channel: "#jenkinswithslack", message: "Build Succeeded - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") + } + } } From 999b5c2546e580a5306de5517a37bcf4ee7991ca Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Fri, 9 Oct 2020 14:19:47 -0700 Subject: [PATCH 18/54] addded jenkisfile for NodeJS --- result/jenkinsfile | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 result/jenkinsfile diff --git a/result/jenkinsfile b/result/jenkinsfile new file mode 100644 index 0000000000..78dea6ca52 --- /dev/null +++ b/result/jenkinsfile @@ -0,0 +1,45 @@ +pipeline { + agent any + + tools{ + nodejs 'NodeJS 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 test' + } + + } + } + } + post{ + always{ + echo "Pipeline for result is completed.." + } + failure{ + slackSend(channel: "jenkinswithslackfornodejs", message: "Build Failed - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") + } + success{ + slackSend(channel: "jenkinswithslackfornodejs", message: "Build Succeeded - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") + } + + } +} From 2b7fd1f851b1864adc89149a14599071d6286035 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Fri, 9 Oct 2020 14:53:43 -0700 Subject: [PATCH 19/54] added test case --- result/test/mock.test.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/result/test/mock.test.js b/result/test/mock.test.js index f99dfdae97..0e924e180c 100644 --- a/result/test/mock.test.js +++ b/result/test/mock.test.js @@ -4,7 +4,7 @@ describe('mock test 1', () => { it('unit test 1', () => { expect(true).to.be.true; }); -}); +}); describe('mock test 2', () => { @@ -27,3 +27,8 @@ describe('mock test 4', () => { }); +describe('mock test 5', () => { + it('unit test 5', () => { + expect(true).to.be.true; + }); +}); From 235f8b4a9b13be59fe6b6292bc92f8b1354b74b2 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 13 Oct 2020 09:59:30 -0700 Subject: [PATCH 20/54] use docker agent instead of maven tools --- worker/Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 77de096f03..a7d08d75af 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,8 +1,10 @@ pipeline { - agent any - tools{ - maven 'Maven 3.6.3' + agent { + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } } stages { From e4ab807492c9b73b5791bce9d24fc79ea3209917 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 13 Oct 2020 10:15:43 -0700 Subject: [PATCH 21/54] added test 5 --- worker/src/test/java/worker/UnitWorker.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/worker/src/test/java/worker/UnitWorker.java b/worker/src/test/java/worker/UnitWorker.java index cb5d513961..35a9917461 100644 --- a/worker/src/test/java/worker/UnitWorker.java +++ b/worker/src/test/java/worker/UnitWorker.java @@ -1,10 +1,10 @@ import org.junit.jupiter.api.Test; - + class UnitWorker { - + @Test void sample1() { - + } @@ -22,4 +22,9 @@ void sample3() { void sample4() { } + + @Test + void sample5() { + + } } From 653acebf555aadabdd7edc9b07b1be2b21e4859d Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 13 Oct 2020 11:13:44 -0700 Subject: [PATCH 22/54] deleted test5 to crosscheck --- worker/src/test/java/worker/UnitWorker.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/worker/src/test/java/worker/UnitWorker.java b/worker/src/test/java/worker/UnitWorker.java index 35a9917461..a67083e2e8 100644 --- a/worker/src/test/java/worker/UnitWorker.java +++ b/worker/src/test/java/worker/UnitWorker.java @@ -23,8 +23,4 @@ void sample4() { } - @Test - void sample5() { - - } } From 9c6231976a94026e8f7865bde02aa71f3d400e0a Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 13 Oct 2020 13:38:34 -0700 Subject: [PATCH 23/54] added docker agent for nodejs for result --- result/jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/result/jenkinsfile b/result/jenkinsfile index 78dea6ca52..0cb0cae948 100644 --- a/result/jenkinsfile +++ b/result/jenkinsfile @@ -1,9 +1,11 @@ pipeline { - agent any - tools{ - nodejs 'NodeJS 8.9.0' +agent { + docker { + image 'node:8.16.0-alpine' + args '-v $HOME/.m2:/root/.m2' } +} stages { stage('build') { From 82ff64b7e35397fd166162ae24d56f9da9493205 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 13 Oct 2020 14:10:54 -0700 Subject: [PATCH 24/54] added jekinsfile for python --- vote/jenkinsfile | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 vote/jenkinsfile diff --git a/vote/jenkinsfile b/vote/jenkinsfile new file mode 100644 index 0000000000..eb8067eb15 --- /dev/null +++ b/vote/jenkinsfile @@ -0,0 +1,47 @@ +pipeline { + +agent { + docker { + image 'python:alpine' + args '-v $HOME/.m2:/root/.m2' + } +} + + 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 vote app" + dir('vote'){ + sh 'nosetests -v' + } + + } + } + } + post{ + always{ + echo "Pipeline for vote is completed.." + } + failure{ + slackSend(channel: "jenkinswithslackfornodejs", message: "Build Failed - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") + } + success{ + slackSend(channel: "jenkinswithslackfornodejs", message: "Build Succeeded - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") + } + + } +} From 7d745d380e3940decb04d585ee94c2439937e3f2 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 13 Oct 2020 14:15:34 -0700 Subject: [PATCH 25/54] changed slack channel --- vote/jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vote/jenkinsfile b/vote/jenkinsfile index eb8067eb15..e9406f74e0 100644 --- a/vote/jenkinsfile +++ b/vote/jenkinsfile @@ -37,10 +37,10 @@ agent { echo "Pipeline for vote is completed.." } failure{ - slackSend(channel: "jenkinswithslackfornodejs", message: "Build Failed - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") + slackSend(channel: "jenkinswithslackforvote", message: "Build Failed - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") } success{ - slackSend(channel: "jenkinswithslackfornodejs", message: "Build Succeeded - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") + slackSend(channel: "jenkinswithslackforvote", message: "Build Succeeded - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") } } From 8cabd18485c64fd9652fa25f43854e4f893554f8 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 13 Oct 2020 14:44:38 -0700 Subject: [PATCH 26/54] changed docker image --- vote/jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vote/jenkinsfile b/vote/jenkinsfile index e9406f74e0..82017f8abd 100644 --- a/vote/jenkinsfile +++ b/vote/jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { - image 'python:alpine' + image 'python:2.7.16-slim' args '-v $HOME/.m2:/root/.m2' } } From c2ce049d3f07773eb131a6fb8d424cf784da5064 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 13 Oct 2020 15:03:12 -0700 Subject: [PATCH 27/54] changed install param --- vote/jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vote/jenkinsfile b/vote/jenkinsfile index 82017f8abd..a1c08b1e62 100644 --- a/vote/jenkinsfile +++ b/vote/jenkinsfile @@ -15,7 +15,7 @@ agent { steps{ echo "Compiling vote app" dir('vote'){ - sh 'pip install -i requirements.txt' + sh 'pip install -r requirements.txt' } } } From e43d56fd2656c2a4945ca1d4eaccf53d35ead777 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 13 Oct 2020 15:12:22 -0700 Subject: [PATCH 28/54] change argument --- vote/jenkinsfile | 2 +- vote/tests/test_frontend.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vote/jenkinsfile b/vote/jenkinsfile index a1c08b1e62..5ca2145ca3 100644 --- a/vote/jenkinsfile +++ b/vote/jenkinsfile @@ -3,7 +3,7 @@ pipeline { agent { docker { image 'python:2.7.16-slim' - args '-v $HOME/.m2:/root/.m2' + args '--user root' } } diff --git a/vote/tests/test_frontend.py b/vote/tests/test_frontend.py index 5e3d37a3d1..4eaf5fe8b9 100644 --- a/vote/tests/test_frontend.py +++ b/vote/tests/test_frontend.py @@ -22,7 +22,7 @@ def test_version_is_set(self): assert 'Version' in str(result.data) def test_processed_by_is_set(self): - """Assert that processed by string is set""" + """Assert that processed by string is set little change here""" result = self.app.get('/') assert 'Processed by' in str(result.data) From 9300e0c4c21bd82bf5c0c8f7d8f3da52f0c290e1 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Thu, 15 Oct 2020 14:09:27 -0700 Subject: [PATCH 29/54] added 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..5c76cf5e26 --- /dev/null +++ b/worker/Dockerfile @@ -0,0 +1,11 @@ +FROM maven:3.6.1-jdk-8-alpine + +WORKDIR /app + +COPY . . + +RUN mvn package -DskipTests && \ + mv target/worker-jar-with-dependencies.jar /run/worker.jar && \ + rm -rf * + +CMD ["java", "-jar", "/run/worker.jar"] From 542d7c6b66e2223803b40b77cb4cf368a9c6751f Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Thu, 15 Oct 2020 15:41:18 -0700 Subject: [PATCH 30/54] added dockerfile with dockerbuild --- worker/Jenkinsfile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index a7d08d75af..4816269cdc 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -44,6 +44,26 @@ pipeline { } } } + + stage('package') { + when{ + branch 'master' + changeset "**/worker/**" + } + steps{ + echo "Packaging worker app with docker" + script{ + docker.withRegistry('https://index.docker.io/v1', 'dockerlogin'){ + def workerImage = docker.build("cziaul/worker:v${env.BUILD_ID}", "./worker") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + } + } + } + } + + + } post{ always{ From 0d0a55010734558fb099261d88346f4357c1b982 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Thu, 15 Oct 2020 16:06:40 -0700 Subject: [PATCH 31/54] taken off chengeset to run everytime --- worker/Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 4816269cdc..ae1fb69bd7 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -48,7 +48,6 @@ pipeline { stage('package') { when{ branch 'master' - changeset "**/worker/**" } steps{ echo "Packaging worker app with docker" From 22d061f7888ebb39e45910923a44a654c0d014f5 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Thu, 15 Oct 2020 16:22:32 -0700 Subject: [PATCH 32/54] taken off stage and condition --- worker/Jenkinsfile | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index ae1fb69bd7..f056baa5f2 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -32,23 +32,6 @@ pipeline { } } stage('package') { - when{ - branch 'master' - changeset "**/worker/**" - } - steps{ - echo "Packaging worker app" - dir('worker'){ - sh 'mvn package -DskipTests' - archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true - } - } - } - - stage('package') { - when{ - branch 'master' - } steps{ echo "Packaging worker app with docker" script{ From 7a4592356514c659bd175e7884896f64f8885193 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Thu, 15 Oct 2020 16:23:48 -0700 Subject: [PATCH 33/54] Dockerfile.bak1 --- worker/Dockerfile.bak1 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 worker/Dockerfile.bak1 diff --git a/worker/Dockerfile.bak1 b/worker/Dockerfile.bak1 new file mode 100644 index 0000000000..5c76cf5e26 --- /dev/null +++ b/worker/Dockerfile.bak1 @@ -0,0 +1,11 @@ +FROM maven:3.6.1-jdk-8-alpine + +WORKDIR /app + +COPY . . + +RUN mvn package -DskipTests && \ + mv target/worker-jar-with-dependencies.jar /run/worker.jar && \ + rm -rf * + +CMD ["java", "-jar", "/run/worker.jar"] From b98a3e03ced43ab458bb1380cf22b28de3a513ba Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Thu, 15 Oct 2020 20:11:23 -0700 Subject: [PATCH 34/54] changed backup file name --- worker/Dockerfile.bak1 | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 worker/Dockerfile.bak1 diff --git a/worker/Dockerfile.bak1 b/worker/Dockerfile.bak1 deleted file mode 100644 index 5c76cf5e26..0000000000 --- a/worker/Dockerfile.bak1 +++ /dev/null @@ -1,11 +0,0 @@ -FROM maven:3.6.1-jdk-8-alpine - -WORKDIR /app - -COPY . . - -RUN mvn package -DskipTests && \ - mv target/worker-jar-with-dependencies.jar /run/worker.jar && \ - rm -rf * - -CMD ["java", "-jar", "/run/worker.jar"] From ab04427d0c0507a2aba0146abf1d1e9e83e47fae Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Thu, 15 Oct 2020 20:43:43 -0700 Subject: [PATCH 35/54] added individual agent --- worker/Jenkinsfile | 51 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index f056baa5f2..361119b8f2 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,14 +1,15 @@ pipeline { - 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/**" } @@ -20,6 +21,14 @@ pipeline { } } stage('test') { + + agent { + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + when{ changeset "**/worker/**" } @@ -31,7 +40,37 @@ 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 "Packaging woker app" + dir('worker'){ + sh 'mvn package -DskipTests' + archiveArtifacts artifacts: '**/target/*.jar', fingerprint:true + + } + } + } + + + stage('docker-package') { + agent any + when{ + changeset "**/worker/**" + } steps{ echo "Packaging worker app with docker" script{ From fe89a6cb62ad0f7e88552fe8c70dcb9d2c596fd5 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Thu, 15 Oct 2020 21:00:19 -0700 Subject: [PATCH 36/54] added / --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 361119b8f2..40a9e82ea7 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -74,7 +74,7 @@ pipeline { steps{ echo "Packaging worker app with docker" script{ - docker.withRegistry('https://index.docker.io/v1', 'dockerlogin'){ + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin'){ def workerImage = docker.build("cziaul/worker:v${env.BUILD_ID}", "./worker") workerImage.push() workerImage.push("${env.BRANCH_NAME}") From 9f453b6185d3a7ea691b214abcbb6507e30906a9 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Sun, 18 Oct 2020 14:20:38 -0700 Subject: [PATCH 37/54] added condition for master --- worker/Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 40a9e82ea7..eb587634ab 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -70,6 +70,8 @@ pipeline { agent any when{ changeset "**/worker/**" + branch 'master' + } steps{ echo "Packaging worker app with docker" From 8b3512ed0fc3a46752a41f4f3500069241dd40c4 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Sun, 18 Oct 2020 15:12:17 -0700 Subject: [PATCH 38/54] added docker packaging --- vote/jenkinsfile | 43 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/vote/jenkinsfile b/vote/jenkinsfile index 5ca2145ca3..8ff94802b8 100644 --- a/vote/jenkinsfile +++ b/vote/jenkinsfile @@ -1,14 +1,16 @@ pipeline { - -agent { - docker { - image 'python:2.7.16-slim' - args '--user root' - } -} + agent none stages { stage('build') { + + agent { + docker { + image 'python:2.7.16-slim' + args '--user root' + } + } + when{ changeset "**/vote/**" } @@ -20,6 +22,14 @@ agent { } } stage('test') { + + agent { + docker { + image 'python:2.7.16-slim' + args '--user root' + } + } + when{ changeset "**/vote/**" } @@ -31,6 +41,25 @@ agent { } } + + stage('docker-package') { + agent any + when{ + changeset "**/vote/**" + branch 'master' + } + steps{ + echo "Packaging worker vote app with docker" + script{ + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin'){ + def workerImage = docker.build("cziaul/worker:v${env.BUILD_ID}", "./vote") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + } + } + } + } + } post{ always{ From a9a3c39e7f7548ba8a4e18f933f080735020b394 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Sun, 18 Oct 2020 21:12:52 -0700 Subject: [PATCH 39/54] added changes for vote(python) and worker(nodejs) app --- result/jenkinsfile | 38 +++++++++++++++++++++++++++++++------- vote/jenkinsfile | 15 ++++++++------- worker/Jenkinsfile | 21 +++++++++++---------- 3 files changed, 50 insertions(+), 24 deletions(-) diff --git a/result/jenkinsfile b/result/jenkinsfile index 0cb0cae948..7c21f470e2 100644 --- a/result/jenkinsfile +++ b/result/jenkinsfile @@ -1,13 +1,12 @@ pipeline { - -agent { - docker { - image 'node:8.16.0-alpine' - args '-v $HOME/.m2:/root/.m2' - } -} +agent none stages { + agent { + docker { + image 'node:8.16.0-alpine' + } + } stage('build') { when{ changeset "**/result/**" @@ -20,17 +19,42 @@ agent { } } 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{ + changeset "**/result/**" + branch 'master' + } + steps{ + echo "Packaging worker result app with docker" + script{ + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin'){ + def workerImage = docker.build("cziaul/result:v${env.BUILD_ID}", "./result") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + } + } + } + } + } post{ always{ diff --git a/vote/jenkinsfile b/vote/jenkinsfile index 8ff94802b8..a2c7a9684c 100644 --- a/vote/jenkinsfile +++ b/vote/jenkinsfile @@ -2,14 +2,14 @@ pipeline { agent none stages { - stage('build') { - agent { - docker { - image 'python:2.7.16-slim' - args '--user root' - } + agent { + docker { + image 'python:2.7.16-slim' + args '--user root' + } } + stage('build') { when{ changeset "**/vote/**" @@ -36,6 +36,7 @@ pipeline { steps{ echo "Running Unit Tests on vote app" dir('vote'){ + sh 'pip install -r requirements.txt' sh 'nosetests -v' } @@ -52,7 +53,7 @@ pipeline { echo "Packaging worker vote app with docker" script{ docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin'){ - def workerImage = docker.build("cziaul/worker:v${env.BUILD_ID}", "./vote") + def workerImage = docker.build("cziaul/vote:v${env.BUILD_ID}", "./vote") workerImage.push() workerImage.push("${env.BRANCH_NAME}") } diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 40a9e82ea7..c936d5176a 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,15 +1,16 @@ pipeline { - agent none + agent none stages { - stage('build') { - agent { - docker { - image 'maven:3.6.1-jdk-8-alpine' - args '-v $HOME/.m2:/root/.m2' - } + agent { + docker { + image 'node:8.16.0-alpine' + args '-v $HOME/.m2:/root/.m2' } + } + + stage('build') { when{ changeset "**/worker/**" } @@ -24,7 +25,7 @@ pipeline { agent { docker { - image 'maven:3.6.1-jdk-8-alpine' + image 'node:8.16.0-alpine' args '-v $HOME/.m2:/root/.m2' } } @@ -46,7 +47,7 @@ pipeline { agent { docker { - image 'maven:3.6.1-jdk-8-alpine' + image 'node:8.16.0-alpine' args '-v $HOME/.m2:/root/.m2' } } @@ -56,7 +57,7 @@ pipeline { changeset "**/worker/**" } steps{ - echo "Packaging woker app" + echo "Packaging worker app" dir('worker'){ sh 'mvn package -DskipTests' archiveArtifacts artifacts: '**/target/*.jar', fingerprint:true From 93e37aebf2ff5e4dde9c519a821f553ce2e83252 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Sun, 18 Oct 2020 21:23:33 -0700 Subject: [PATCH 40/54] corrected worker --- worker/Jenkinsfile | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index c936d5176a..820d227248 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,14 +1,14 @@ pipeline { - agent none + agent none stages { agent { - docker { - image 'node:8.16.0-alpine' - args '-v $HOME/.m2:/root/.m2' - } - } + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } stage('build') { when{ @@ -21,24 +21,25 @@ pipeline { } } } + stage('test') { - agent { - docker { - image 'node:8.16.0-alpine' - args '-v $HOME/.m2:/root/.m2' - } - } + agent { + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + + when{ + changeset "**/worker/**" + } - when{ - changeset "**/worker/**" - } steps{ echo "Running Unit Tests on worker app" dir('worker'){ sh 'mvn clean test' } - } } @@ -46,11 +47,11 @@ pipeline { stage('package') { agent { - docker { - image 'node:8.16.0-alpine' - args '-v $HOME/.m2:/root/.m2' - } - } + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } when{ branch 'master' @@ -66,7 +67,6 @@ pipeline { } } - stage('docker-package') { agent any when{ @@ -84,8 +84,6 @@ pipeline { } } - - } post{ always{ From 329928ea3767a699700e6f88ca8a17ad3dcaa2de Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Sun, 18 Oct 2020 21:55:46 -0700 Subject: [PATCH 41/54] moved agent under build tag --- result/jenkinsfile | 11 ++++++----- vote/jenkinsfile | 13 +++++++------ worker/Jenkinsfile | 14 ++++++++------ 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/result/jenkinsfile b/result/jenkinsfile index 7c21f470e2..b17c01de73 100644 --- a/result/jenkinsfile +++ b/result/jenkinsfile @@ -2,12 +2,13 @@ pipeline { agent none stages { - agent { - docker { - image 'node:8.16.0-alpine' - } - } + stage('build') { + agent { + docker { + image 'node:8.16.0-alpine' + } + } when{ changeset "**/result/**" } diff --git a/vote/jenkinsfile b/vote/jenkinsfile index a2c7a9684c..0b6c7a3bdd 100644 --- a/vote/jenkinsfile +++ b/vote/jenkinsfile @@ -3,14 +3,15 @@ pipeline { stages { - agent { - docker { - image 'python:2.7.16-slim' - args '--user root' - } - } stage('build') { + agent { + docker { + image 'python:2.7.16-slim' + args '--user root' + } + } + when{ changeset "**/vote/**" } diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 820d227248..80a024fc4f 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -3,14 +3,16 @@ pipeline { agent none stages { - agent { - docker { - image 'maven:3.6.1-jdk-8-alpine' - args '-v $HOME/.m2:/root/.m2' - } - } stage('build') { + + agent { + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + when{ changeset "**/worker/**" } From e88ff5c81a7f14ab73835aa8c63dd837317e695f Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Mon, 19 Oct 2020 20:37:13 -0700 Subject: [PATCH 42/54] added mono pipeline code all in one --- Jenkinsfile | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 211 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..fb87797c7d --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,211 @@ +pipeline { + + 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 "Packaging woker app" + dir('worker'){ + sh 'mvn package -DskipTests' + archiveArtifacts artifacts: '**/target/*.jar', fingerprint:true + + } + } + } + + + stage('worker-docker-package') { + agent any + when{ + changeset "**/worker/**" + } + steps{ + echo "Packaging worker app with docker" + script{ + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin'){ + def workerImage = docker.build("cziaul/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' + } + } + } + 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('result-docker-package') { + agent any + when{ + changeset "**/result/**" + branch 'master' + } + steps{ + echo "Packaging worker result app with docker" + script{ + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin'){ + def workerImage = docker.build("cziaul/result:v${env.BUILD_ID}", "./result") + workerImage.push() + workerImage.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' + } + } + } + stage('vote test') { + + agent { + docker { + image 'python:2.7.16-slim' + args '--user root' + } + } + + when{ + changeset "**/vote/**" + } + steps{ + echo "Running Unit Tests on vote app" + dir('vote'){ + sh 'pip install -r requirements.txt' + sh 'nosetests -v' + } + + } + } + + stage('vote-docker-package') { + agent any + when{ + changeset "**/vote/**" + branch 'master' + } + steps{ + echo "Packaging worker vote app with docker" + script{ + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin'){ + def workerImage = docker.build("cziaul/vote:v${env.BUILD_ID}", "./vote") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + } + } + } + } + + } + post{ + always{ + echo "Pipeline for instavote is completed.." + } + failure{ + slackSend(channel: "#jenkinswithslack", message: "Build Failed - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") + } + success{ + slackSend(channel: "#jenkinswithslack", message: "Build Succeeded - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") + } + + } +} From 16416d3d85e47c9e9ea5c1a5a9c27817b38a32f5 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Mon, 19 Oct 2020 20:53:34 -0700 Subject: [PATCH 43/54] changed README to test full app --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index eff33c78fe..3e8302df6b 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ Example Voting App This is a sample testing webhook testy +This is a test for mono pipline + Getting started --------------- From c9e9177349743e341d2895b045d1709e06f8495d Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Mon, 19 Oct 2020 20:59:54 -0700 Subject: [PATCH 44/54] Added README file for result and vote --- vote/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 vote/README.md diff --git a/vote/README.md b/vote/README.md new file mode 100644 index 0000000000..22879b3098 --- /dev/null +++ b/vote/README.md @@ -0,0 +1 @@ +This is to Test vote for Mono Pipeline From 26e740884a0f1f2c750a3645042459a577eb039d Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 20 Oct 2020 09:26:20 -0700 Subject: [PATCH 45/54] adding docker compose file --- docker-compose.yaml | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 docker-compose.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000000..9de271e143 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,45 @@ +version: "3.7" + +volumes: + db-data: + +networks: + instavote: + driver: bridge + + +services: + vote: + image: cziaul/vote:master + ports: + - 5000:80 + depends_on: + - redis + networks: + - instavote + redis: + image: redis:alpine + networks: + - instavote + + db: + image: postgres:9.4 + volumes: + - "db-data:/var/lib/postgresql/data" + networks: + - instavote + result: + image: cziaul/result:master + ports: + - 5001:4000 + depends_on: + - db + networks: + - instavote + worker: + image: cziaul/worker:master + depends_on: + - redis + - db + networks: + - instavote From 07f1ff3540878d6c6bf9f6edb408c35155722656 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 20 Oct 2020 09:38:25 -0700 Subject: [PATCH 46/54] added changes to integrate docker-compose with jenkinsfile --- Jenkinsfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index fb87797c7d..40fc4ed9b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -195,6 +195,20 @@ pipeline { } } + stage('deploy to dev') { + + agent any + + when{ + branch 'master' + } + steps{ + echo "Deploy instavote app with docker compose" + sh 'docker compose up -d' + } + } + + } post{ always{ From 28ca8f6d3c9925a398a854e779462839cc66e943 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 20 Oct 2020 09:46:43 -0700 Subject: [PATCH 47/54] ommited when cluse for master to test --- Jenkinsfile | 3 --- result/README.md | 1 + worker/DockerfileTest | 11 +++++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 result/README.md create mode 100644 worker/DockerfileTest diff --git a/Jenkinsfile b/Jenkinsfile index 40fc4ed9b6..19e4dd2339 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -199,9 +199,6 @@ pipeline { agent any - when{ - branch 'master' - } steps{ echo "Deploy instavote app with docker compose" sh 'docker compose up -d' diff --git a/result/README.md b/result/README.md new file mode 100644 index 0000000000..3c4470fb7a --- /dev/null +++ b/result/README.md @@ -0,0 +1 @@ +This is to test Mono Pipeline diff --git a/worker/DockerfileTest b/worker/DockerfileTest new file mode 100644 index 0000000000..5c76cf5e26 --- /dev/null +++ b/worker/DockerfileTest @@ -0,0 +1,11 @@ +FROM maven:3.6.1-jdk-8-alpine + +WORKDIR /app + +COPY . . + +RUN mvn package -DskipTests && \ + mv target/worker-jar-with-dependencies.jar /run/worker.jar && \ + rm -rf * + +CMD ["java", "-jar", "/run/worker.jar"] From 3b6602abaccfadaf7e10aceced91110ce8ab95b7 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 20 Oct 2020 10:59:30 -0700 Subject: [PATCH 48/54] corrected to docker-compose --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 19e4dd2339..f7b2267a92 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -201,7 +201,7 @@ pipeline { steps{ echo "Deploy instavote app with docker compose" - sh 'docker compose up -d' + sh 'docker-compose up -d' } } From 0970783c1e63234e49e48a94eb358f7083c0dc1f Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 20 Oct 2020 11:22:26 -0700 Subject: [PATCH 49/54] added back when condition --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index f7b2267a92..610cbbb489 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -199,6 +199,9 @@ pipeline { agent any + when{ + branch 'master' + } steps{ echo "Deploy instavote app with docker compose" sh 'docker-compose up -d' From b46c596c6478a7c6691c1bd97038ebd813277310 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Tue, 20 Oct 2020 13:37:14 -0700 Subject: [PATCH 50/54] updated voting option --- vote/app.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vote/app.py b/vote/app.py index db5ff2e4d8..a4a8b6515c 100644 --- a/vote/app.py +++ b/vote/app.py @@ -5,10 +5,10 @@ import random import json -option_a = os.getenv('OPTION_A', "Emacs") -option_b = os.getenv('OPTION_B', "Vi") +option_a = os.getenv('OPTION_A', "Travis") +option_b = os.getenv('OPTION_B', "CircleCI") hostname = socket.gethostname() -version = 'v1' +version = 'v2' app = Flask(__name__) From 627be58343a6a8b50c71772a923cd2f3b1bea4d3 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Sat, 24 Oct 2020 14:27:08 -0700 Subject: [PATCH 51/54] added sonarqube configuration --- Jenkinsfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 610cbbb489..fa2b0dab51 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -195,6 +195,20 @@ pipeline { } } + + stage('Sonarqube') { + agent any + environment{ + sonarpath = tool 'SonarScanner' + } + steps { + echo 'Running Sonarqube Analysis..' + withSonarQubeEnv('sonar') { + sh "${sonarpath}/bin/sonar-scanner -Dproject.settings=sonar-project.properties" + } + } + } + stage('deploy to dev') { agent any From 7ed5cfb8fb64f9a5b72b1260d6d600adb7a3fb8c Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Wed, 28 Oct 2020 12:50:54 -0700 Subject: [PATCH 52/54] added integration test --- Jenkinsfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index fa2b0dab51..3bfffa3d7e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -177,6 +177,24 @@ pipeline { } } + 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('vote-docker-package') { agent any when{ From ae576ee4ee35fee09ef7d6a2e14d911120663f16 Mon Sep 17 00:00:00 2001 From: "Ziaul.Chowdhury" Date: Wed, 28 Oct 2020 20:11:58 -0700 Subject: [PATCH 53/54] change variable --- e2e/.env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/.env b/e2e/.env index ba78b2ea4c..c45a7cb0b4 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=cziaul/vote:master +WORKER_IMAGE=cziaul/worker:master +RESULT_IMAGE=cziaul/result:master From 673eabcbd41bccf3a8fdedd9c65f8a981c67ed91 Mon Sep 17 00:00:00 2001 From: Ziaul Chowdhury Date: Mon, 25 May 2026 11:49:24 -0500 Subject: [PATCH 54/54] Added Test4 for scenario Jira 002 --- worker/src/test/java/worker/UnitWorker.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/worker/src/test/java/worker/UnitWorker.java b/worker/src/test/java/worker/UnitWorker.java index a67083e2e8..9dbb7b1d0a 100644 --- a/worker/src/test/java/worker/UnitWorker.java +++ b/worker/src/test/java/worker/UnitWorker.java @@ -23,4 +23,9 @@ void sample4() { } + @Test + void sample4() { + + } + }