From 0206b660a4a4454fcf41e33bac01a671a6917205 Mon Sep 17 00:00:00 2001 From: Firebrand01 <103306768+Firebrand01@users.noreply.github.com> Date: Tue, 12 Apr 2022 02:30:30 -0400 Subject: [PATCH 01/16] Create README.md --- 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..79af3c8ca9 --- /dev/null +++ b/worker/README.md @@ -0,0 +1 @@ +## Worker Java App From 2267db6f260675538eaaa15eb4abc2a19ce2af36 Mon Sep 17 00:00:00 2001 From: Firebrand01 <103306768+Firebrand01@users.noreply.github.com> Date: Tue, 12 Apr 2022 03:11:16 -0400 Subject: [PATCH 02/16] Update README.md --- worker/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/worker/README.md b/worker/README.md index 79af3c8ca9..6351c08202 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1 +1,3 @@ ## Worker Java App + + * Build Status From 750f756922e695442864640fd400b9ccb162a69b Mon Sep 17 00:00:00 2001 From: Firebrand01 <103306768+Firebrand01@users.noreply.github.com> Date: Tue, 12 Apr 2022 03:20:20 -0400 Subject: [PATCH 03/16] Update README.md --- worker/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/worker/README.md b/worker/README.md index 6351c08202..3e5107105e 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1,3 +1,5 @@ ## Worker Java App * Build Status + +[![Build Status](http://0.0.0.0:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://0.0.0.0:8080/job/instavote/job/worker-test/) From ec7fd572759652a29ae10ff440272aeb6d0b9da3 Mon Sep 17 00:00:00 2001 From: Firebrand01 <103306768+Firebrand01@users.noreply.github.com> Date: Tue, 12 Apr 2022 18:34:17 -0400 Subject: [PATCH 04/16] Update README.md --- worker/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/worker/README.md b/worker/README.md index 3e5107105e..388b96d794 100644 --- a/worker/README.md +++ b/worker/README.md @@ -3,3 +3,5 @@ * Build Status [![Build Status](http://0.0.0.0:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://0.0.0.0:8080/job/instavote/job/worker-test/) + + * Cambio Test From 429177e1de1f2c8e515c36d50dc3a3e1d00274fb Mon Sep 17 00:00:00 2001 From: Firebrand01 <103306768+Firebrand01@users.noreply.github.com> Date: Tue, 12 Apr 2022 18:39:14 -0400 Subject: [PATCH 05/16] Update README.md --- worker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/README.md b/worker/README.md index 388b96d794..0927909f1c 100644 --- a/worker/README.md +++ b/worker/README.md @@ -4,4 +4,4 @@ [![Build Status](http://0.0.0.0:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://0.0.0.0:8080/job/instavote/job/worker-test/) - * Cambio Test + * Cambio Test 2 From fbfc297f60b5c537e2142434117e27c4988ef2bc Mon Sep 17 00:00:00 2001 From: Firebrand01 <103306768+Firebrand01@users.noreply.github.com> Date: Wed, 13 Apr 2022 12:39:22 -0400 Subject: [PATCH 06/16] Update README.md --- worker/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worker/README.md b/worker/README.md index 0927909f1c..ae95513d1e 100644 --- a/worker/README.md +++ b/worker/README.md @@ -2,6 +2,6 @@ * Build Status -[![Build Status](http://0.0.0.0:8080/buildStatus/icon?job=instavote%2Fworker-test)](http://0.0.0.0:8080/job/instavote/job/worker-test/) +[![Build Status](https://smee.io/dPkO6FVnqdAhRku/buildStatus/icon?job=instavote%2Fworker-test)](https://smee.io/dPkO6FVnqdAhRku/job/instavote/job/worker-test/) - * Cambio Test 2 + * Cambio Test 3 13/04/2022 From e2864c263bcfbfb48824f1ea063d54d5d8eeeba0 Mon Sep 17 00:00:00 2001 From: Firebrand01 <103306768+Firebrand01@users.noreply.github.com> Date: Wed, 13 Apr 2022 12:43:25 -0400 Subject: [PATCH 07/16] Update README.md --- worker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/README.md b/worker/README.md index ae95513d1e..7cebd56663 100644 --- a/worker/README.md +++ b/worker/README.md @@ -4,4 +4,4 @@ [![Build Status](https://smee.io/dPkO6FVnqdAhRku/buildStatus/icon?job=instavote%2Fworker-test)](https://smee.io/dPkO6FVnqdAhRku/job/instavote/job/worker-test/) - * Cambio Test 3 13/04/2022 + * Cambio Test 4 13/04/2022 From 63ab2aa9791a85660e41b186bafb58f2e905d2ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20D=C3=ADaz?= Date: Tue, 10 May 2022 01:56:14 -0400 Subject: [PATCH 08/16] test --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b8ad8a94af..5b13d816b5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ Example Voting App ========= + + + Getting started --------------- From b83837f526716493e164380bae818442145aa2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20D=C3=ADaz?= Date: Tue, 10 May 2022 01:58:44 -0400 Subject: [PATCH 09/16] added application info --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b13d816b5..1580af6ee7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Example Voting App ========= - +This is a sample instavote application. Getting started From 198d9c01a69c2a5a82c8d074f5badc05a54e73b7 Mon Sep 17 00:00:00 2001 From: Firebrand01 Date: Mon, 23 May 2022 21:40:01 -0400 Subject: [PATCH 10/16] adden Jenkinksfile for worker --- worker/Jenkinsfile | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 worker/Jenkinsfile diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile new file mode 100644 index 0000000000..3c9b444424 --- /dev/null +++ b/worker/Jenkinsfile @@ -0,0 +1,42 @@ + + +pipeline { + agent any + + + tools { + maven 'apache-maven-3.6.1' + } + + stages { + stage('build') { + steps { + echo 'Compiling worket app' + dir('worker') { + sh 'mvn compile' + + } + + } + } + stage('test') { + steps { + echo 'Running Unit Test on worker app' + + } + } + stage('package') { + steps { + echo 'Packaging worket app' + + } + } + } + post { + always { + echo 'Build pipeline for worker run is complete..' + } + } + + +} From 6b7f1b82b0d854dedbda3ab1cf34bea462d0caae Mon Sep 17 00:00:00 2001 From: Firebrand01 Date: Mon, 23 May 2022 22:31:23 -0400 Subject: [PATCH 11/16] update Jenkinsfile --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 3c9b444424..ba8f43a038 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { tools { - maven 'apache-maven-3.6.1' + maven 'Maven 3.6.1' } stages { From 21127ae4b9fad3d0633baab8d8d3d11ea6cbb2a8 Mon Sep 17 00:00:00 2001 From: Firebrand01 Date: Wed, 25 May 2022 02:11:45 -0400 Subject: [PATCH 12/16] run packagin step only on master --- worker/Jenkinsfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index ba8f43a038..988d864569 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -10,6 +10,10 @@ pipeline { stages { stage('build') { + when { + branch 'master' + changeset "**/worket/**" + } steps { echo 'Compiling worket app' dir('worker') { @@ -20,12 +24,21 @@ pipeline { } } stage('test') { + + when { + branch 'master' + changeset "**/worket/**" + } steps { echo 'Running Unit Test on worker app' } } stage('package') { + when { + branch 'master' + changeset "**/worket/**" + } steps { echo 'Packaging worket app' From 343ac5d784fcbc82a58d801462ce5e3f0c44bf9a Mon Sep 17 00:00:00 2001 From: Firebrand01 Date: Wed, 25 May 2022 02:40:54 -0400 Subject: [PATCH 13/16] add slack integration --- worker/Jenkinsfile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 988d864569..5777e0f8b0 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -10,10 +10,7 @@ pipeline { stages { stage('build') { - when { - branch 'master' - changeset "**/worket/**" - } + steps { echo 'Compiling worket app' dir('worker') { @@ -49,6 +46,16 @@ pipeline { always { echo 'Build pipeline for worker run is complete..' } + failure { + slackSend (channel: "instavote-cd", message: "Build Failed - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL} | Open>)") + } + + success { + slackSend (channel: "instavote-cd", message: "Build Succeeded - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL} | Open>)") + } + + + } From cf47806e3a5216ac919b9cee2d1ca6c75065d6d4 Mon Sep 17 00:00:00 2001 From: Firebrand01 Date: Wed, 25 May 2022 02:50:07 -0400 Subject: [PATCH 14/16] added jenkinsfile for result app --- result/Jenkinsfile | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 result/Jenkinsfile diff --git a/result/Jenkinsfile b/result/Jenkinsfile new file mode 100644 index 0000000000..1a151ada56 --- /dev/null +++ b/result/Jenkinsfile @@ -0,0 +1,67 @@ + + +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 Test on result app' + dir('result') { + sh 'npm install' + sh 'npm test' + + } + + } + } + + } + + +/* + post { + always { + echo 'Build pipeline for worker run is complete..' + } + failure { + slackSend (channel: "instavote-cd", message: "Build Failed - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL} | Open>)") + } + + success { + slackSend (channel: "instavote-cd", message: "Build Succeeded - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL} | Open>)") + } + + + + } */ + + +} From 75869143ccf5276b78961a800246b443aed67edc Mon Sep 17 00:00:00 2001 From: Firebrand01 Date: Wed, 25 May 2022 02:53:52 -0400 Subject: [PATCH 15/16] added test 5 --- result/test/mock.test.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/result/test/mock.test.js b/result/test/mock.test.js index f99dfdae97..bdcd486e79 100644 --- a/result/test/mock.test.js +++ b/result/test/mock.test.js @@ -26,4 +26,10 @@ describe('mock test 4', () => { }); }); +describe('mock test 5', () => { + it('unit test 5', () => { + expect(true).to.be.true; + }); +}); + From cdea038fb745dda7e4131950ec37aaccfdf4efe1 Mon Sep 17 00:00:00 2001 From: Firebrand01 Date: Wed, 25 May 2022 03:06:59 -0400 Subject: [PATCH 16/16] fix nodeJs name --- result/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index 1a151ada56..948bc26f32 100644 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { tools { - nodejs 'NodeJs 8.9.0' + nodejs 'NodeJS 8.9.0' } stages {