From ea97e7d4b8cd7f5b91f661d787ce378d90cc2ae8 Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 13:01:11 +0330 Subject: [PATCH 01/25] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b8ad8a94af..0552a599d3 100644 --- a/README.md +++ b/README.md @@ -58,3 +58,4 @@ Note ---- The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. +### 2022-12-04 ### 13:01 From 005f8414d7935825c45111c7e5dd37f39af38c68 Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 13:08:51 +0330 Subject: [PATCH 02/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0552a599d3..aea42c8b3b 100644 --- a/README.md +++ b/README.md @@ -58,4 +58,4 @@ Note ---- The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. -### 2022-12-04 ### 13:01 +### 2022-12-04 ### 13:08 From ca2acc73a97a54e1177a716d9ca3979f9c89c5df Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 13:43:42 +0330 Subject: [PATCH 03/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aea42c8b3b..ca6d6b4e0b 100644 --- a/README.md +++ b/README.md @@ -58,4 +58,4 @@ Note ---- The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. -### 2022-12-04 ### 13:08 +### 2022-12-04 ### 13:43 From 9c3310a7152b36c1603c3c022ac6a5c4e744d557 Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 13:45:36 +0330 Subject: [PATCH 04/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca6d6b4e0b..6d88c4ea67 100644 --- a/README.md +++ b/README.md @@ -58,4 +58,4 @@ Note ---- The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. -### 2022-12-04 ### 13:43 +### 2022-12-04 ### 13:45 From 010338406eafd801356f88a2e95c209ff18c715f Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 13:52:39 +0330 Subject: [PATCH 05/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6d88c4ea67..9046feef69 100644 --- a/README.md +++ b/README.md @@ -58,4 +58,4 @@ Note ---- The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. -### 2022-12-04 ### 13:45 +### 2022-12-04 ### 13:52 From 115dbfa01cd0f45cb22654fc1b284062f9c3ab02 Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 17:50:04 +0330 Subject: [PATCH 06/25] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9046feef69..cbb00f143f 100644 --- a/README.md +++ b/README.md @@ -58,4 +58,5 @@ Note ---- The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. -### 2022-12-04 ### 13:52 +### 2022-12-04 ### 17:49 +[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) From 0d19c54c838fdf79de9895a3219704fc5cd71cdc Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 18:02:21 +0330 Subject: [PATCH 07/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cbb00f143f..4e471d09a6 100644 --- a/README.md +++ b/README.md @@ -58,5 +58,5 @@ Note ---- The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. -### 2022-12-04 ### 17:49 +### 2022-12-04 ### 18:02 [![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) From de4adb54c2edba34f90e86be1d62ebbff3c2b4be Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 18:08:14 +0330 Subject: [PATCH 08/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e471d09a6..c0b7f541f4 100644 --- a/README.md +++ b/README.md @@ -59,4 +59,4 @@ Note The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. ### 2022-12-04 ### 18:02 -[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) +[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)] From 7295e97634bc756d628db2e33b5fce4b81b8e28a Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 18:08:48 +0330 Subject: [PATCH 09/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c0b7f541f4..946f6cdb3a 100644 --- a/README.md +++ b/README.md @@ -59,4 +59,4 @@ Note The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. ### 2022-12-04 ### 18:02 -[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)] +![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build) From 4a51111cf11880043b3cdbf3ef48c03bb3190462 Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 18:10:28 +0330 Subject: [PATCH 10/25] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 946f6cdb3a..dd2d348bf2 100644 --- a/README.md +++ b/README.md @@ -58,5 +58,6 @@ Note ---- The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. -### 2022-12-04 ### 18:02 -![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build) +### 2022-12-04 ### 18:10 + +[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) From fad42e5f8ca804066f17c13d5df7f096bb91e82d Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 18:17:13 +0330 Subject: [PATCH 11/25] Update README.md --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dd2d348bf2..59eefb3200 100644 --- a/README.md +++ b/README.md @@ -52,12 +52,10 @@ Architecture * A .NET worker which consumes votes and stores them in… * A Postgres database backed by a Docker volume * A Node.js webapp which shows the results of the voting in real time - +[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) Note ---- The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. -### 2022-12-04 ### 18:10 - -[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) +### 2022-12-04 ### 18:15 From 5a1f54c977dbbd32e010bd4eadd155831db4e274 Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 18:18:06 +0330 Subject: [PATCH 12/25] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 59eefb3200..a3ac94cb9d 100644 --- a/README.md +++ b/README.md @@ -52,10 +52,10 @@ Architecture * A .NET worker which consumes votes and stores them in… * A Postgres database backed by a Docker volume * A Node.js webapp which shows the results of the voting in real time -[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) Note ---- The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. -### 2022-12-04 ### 18:15 +### 2022-12-04 ### 18:18 +[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) From b3fdc2b78c2af708be40a89f8644ebf458d003c6 Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 18:59:24 +0330 Subject: [PATCH 13/25] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a3ac94cb9d..b81d571359 100644 --- a/README.md +++ b/README.md @@ -59,3 +59,5 @@ Note The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. ### 2022-12-04 ### 18:18 [![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) + +[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://5.61.27.73:8080/job/instavote/job/worker-test/)subject=Unittest From 3569495afab7bf28c1736333bd522f9965fd1de9 Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 18:59:56 +0330 Subject: [PATCH 14/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b81d571359..4529aad6f7 100644 --- a/README.md +++ b/README.md @@ -60,4 +60,4 @@ The voting application only accepts one vote per client. It does not register vo ### 2022-12-04 ### 18:18 [![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) -[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://5.61.27.73:8080/job/instavote/job/worker-test/)subject=Unittest +[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://5.61.27.73:8080/job/instavote/job/worker-test/) subject=Unittest From 0fa33bba6b346512e0a4722f637499b23273fae1 Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 19:06:31 +0330 Subject: [PATCH 15/25] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4529aad6f7..abfa373b3d 100644 --- a/README.md +++ b/README.md @@ -59,5 +59,5 @@ Note The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. ### 2022-12-04 ### 18:18 [![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) - -[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://5.61.27.73:8080/job/instavote/job/worker-test/) subject=Unittest +subject=Unittest +[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://5.61.27.73:8080/job/instavote/job/worker-test/) From 18ac1de7e5c50432780a1518e7289843006e02a6 Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 19:27:47 +0330 Subject: [PATCH 16/25] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index abfa373b3d..2ae197a928 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,8 @@ Note The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. ### 2022-12-04 ### 18:18 -[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) subject=Unittest + +[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) + [![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://5.61.27.73:8080/job/instavote/job/worker-test/) From 322790ef2363dcf8c965bcf00353452913dc3c20 Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 19:32:00 +0330 Subject: [PATCH 17/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ae197a928..c1a462265f 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ Note ---- The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. -### 2022-12-04 ### 18:18 +### 2022-12-04 ### 19:31 subject=Unittest [![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) From 8a528470ce4913099875a9e4cfd7016a16af6751 Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 19:58:38 +0330 Subject: [PATCH 18/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c1a462265f..0d4135d643 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,6 @@ The voting application only accepts one vote per client. It does not register vo ### 2022-12-04 ### 19:31 subject=Unittest -[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) +![Build Status](http://5.61.27.73:8080/job/instavote/job/worker-build/) [![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://5.61.27.73:8080/job/instavote/job/worker-test/) From e9bd35f15892c4945eb889046185468084d62c6b Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 19:59:44 +0330 Subject: [PATCH 19/25] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0d4135d643..332c23f755 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,6 @@ The voting application only accepts one vote per client. It does not register vo ### 2022-12-04 ### 19:31 subject=Unittest -![Build Status](http://5.61.27.73:8080/job/instavote/job/worker-build/) +[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)] [![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://5.61.27.73:8080/job/instavote/job/worker-test/) From 3e50cd4087496a61bb734fbbb7f7bca5d672a89a Mon Sep 17 00:00:00 2001 From: Amin Shateri Date: Sun, 4 Dec 2022 20:01:50 +0330 Subject: [PATCH 20/25] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 332c23f755..1c4edbb9b8 100644 --- a/README.md +++ b/README.md @@ -57,9 +57,8 @@ Note ---- The voting application only accepts one vote per client. It does not register votes if a vote has already been submitted from a client. -### 2022-12-04 ### 19:31 +### 2022-12-04 ### 20:01 subject=Unittest - -[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)] +[![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) [![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://5.61.27.73:8080/job/instavote/job/worker-test/) From 157b72c0934d8217d7690a18e276530d558cdf8d Mon Sep 17 00:00:00 2001 From: aminsh86 Date: Mon, 5 Dec 2022 14:22:03 +0000 Subject: [PATCH 21/25] added application info --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1c4edbb9b8..295f36f7ed 100644 --- a/README.md +++ b/README.md @@ -62,3 +62,5 @@ subject=Unittest [![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-build)](http://5.61.27.73:8080/job/instavote/job/worker-build/) [![Build Status](http://5.61.27.73:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://5.61.27.73:8080/job/instavote/job/worker-test/) + +### 2022-12-05 ### 17:50 From c05f25c99361655da3672c8fbdacec4a710978de Mon Sep 17 00:00:00 2001 From: aminsh86 Date: Tue, 6 Dec 2022 15:48:57 +0000 Subject: [PATCH 22/25] added Jenkinsfile for worker with build job --- worker/Jenkinsfile | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 worker/Jenkinsfile diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile new file mode 100644 index 0000000000..4be045d914 --- /dev/null +++ b/worker/Jenkinsfile @@ -0,0 +1,32 @@ +pipeline { + agent any + + tools{ + maven 'maven 3.6.1' + } + stages{ + stage("build"){ + steps{ + echo 'Compiling worker app' + dir('worker'){ + sh 'mvn compile' + } + } + } + stage("test"){ + steps{ + echo 'Running Unit Tets on worker app' + } + } + stage("package"){ + steps{ + echo 'Packaging worker app' + } + } + } + post{ + always{ + echo 'Building multibranch pipeline for worker is completed..' + } + } +} From c4319d49b890efad2b8eadee60a65110ef2317d4 Mon Sep 17 00:00:00 2001 From: aminsh86 Date: Wed, 7 Dec 2022 08:40:39 +0000 Subject: [PATCH 23/25] added Test and package job for worker pipeline --- worker/Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 4be045d914..3bf99084e9 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -16,11 +16,17 @@ pipeline { stage("test"){ steps{ echo 'Running Unit Tets on worker app' + dir('worker'){ + sh 'mvn clean test' + } } } stage("package"){ steps{ echo 'Packaging worker app' + dir('worker'){ + sh 'mvn package' + } } } } From 43bfe42c75b0ce0bb52db701ccd301aa82c6e72c Mon Sep 17 00:00:00 2001 From: aminsh86 Date: Wed, 7 Dec 2022 08:55:42 +0000 Subject: [PATCH 24/25] archive artifacts, skip test and package --- worker/Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 3bf99084e9..fb94a6403a 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -25,13 +25,15 @@ pipeline { steps{ echo 'Packaging worker app' dir('worker'){ - sh 'mvn package' + sh 'mvn package -DskipTests' } } } } post{ always{ + archiveArtifacts artifacts: '**/target/*.jar', + fingerprint: true echo 'Building multibranch pipeline for worker is completed..' } } From 6e506c891a0b24c5a9469519f954a1f279b895a1 Mon Sep 17 00:00:00 2001 From: aminsh86 Date: Wed, 7 Dec 2022 09:54:47 +0000 Subject: [PATCH 25/25] run package step only on master, run stages only worker changes --- worker/Jenkinsfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index fb94a6403a..0091427d6b 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -6,6 +6,9 @@ pipeline { } stages{ stage("build"){ + when{ + changeset "**/worker/**" + } steps{ echo 'Compiling worker app' dir('worker'){ @@ -14,6 +17,9 @@ pipeline { } } stage("test"){ + when{ + changeset "**/worker/**" + } steps{ echo 'Running Unit Tets on worker app' dir('worker'){ @@ -22,6 +28,10 @@ pipeline { } } stage("package"){ + when{ + branch 'master' + changeset "**/worker/**" + } steps{ echo 'Packaging worker app' dir('worker'){