From 73651f1477b7e36326991bd6703bb8ef03c78c7a Mon Sep 17 00:00:00 2001 From: Lexar_flash Date: Wed, 24 Feb 2021 15:23:35 -0800 Subject: [PATCH 01/48] 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..19b19adb07 --- /dev/null +++ b/worker/README.md @@ -0,0 +1 @@ +[![Build Status](http://localhost:8081/buildStatus/icon?job=compile)](http://localhost:8081/job/compile/) From b0ad8807b11f78b2ade02b96ad48a64f9c7f5721 Mon Sep 17 00:00:00 2001 From: Lexar_flash Date: Wed, 24 Feb 2021 15:26:04 -0800 Subject: [PATCH 02/48] 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 19b19adb07..00d10c990c 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1 +1 @@ -[![Build Status](http://localhost:8081/buildStatus/icon?job=compile)](http://localhost:8081/job/compile/) +[![Build Status](http://http://192.168.219.219/:8081/buildStatus/icon?job=compile)](http://http://192.168.219.219/:8081/job/compile/) From cd526b3c460b8ad1f49d900fafc43d0aa8043c25 Mon Sep 17 00:00:00 2001 From: Lexar_flash Date: Wed, 24 Feb 2021 15:27:16 -0800 Subject: [PATCH 03/48] 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 00d10c990c..b4167b5ce1 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1 +1 @@ -[![Build Status](http://http://192.168.219.219/:8081/buildStatus/icon?job=compile)](http://http://192.168.219.219/:8081/job/compile/) +[![Build Status](http://http://192.168.219.219:8081/buildStatus/icon?job=compile)](http://http://192.168.219.219:8081/job/compile/) From 3541ea570e1df49bf9b1a8dba85b90e5eb16cc43 Mon Sep 17 00:00:00 2001 From: Lexar_flash Date: Wed, 24 Feb 2021 15:27:33 -0800 Subject: [PATCH 04/48] 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 b4167b5ce1..47ba6a0c94 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1 +1 @@ -[![Build Status](http://http://192.168.219.219:8081/buildStatus/icon?job=compile)](http://http://192.168.219.219:8081/job/compile/) +[![Build Status](http://192.168.219.219:8081/buildStatus/icon?job=compile)](http://192.168.219.219:8081/job/compile/) From 3700d06a0e9043c1889c7b9c6cc9f3157dd847a6 Mon Sep 17 00:00:00 2001 From: Lexar_flash Date: Wed, 24 Feb 2021 15:29:13 -0800 Subject: [PATCH 05/48] Update README.md --- worker/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/worker/README.md b/worker/README.md index 47ba6a0c94..74b20e6b86 100644 --- a/worker/README.md +++ b/worker/README.md @@ -1 +1,4 @@ [![Build Status](http://192.168.219.219:8081/buildStatus/icon?job=compile)](http://192.168.219.219:8081/job/compile/) + + +NEW From f69cdea283cdd01ade4120661da759368518a14c Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 18:19:46 -0800 Subject: [PATCH 06/48] new --- worker/Jenkinsfile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 worker/Jenkinsfile diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile new file mode 100644 index 0000000000..b32df383d2 --- /dev/null +++ b/worker/Jenkinsfile @@ -0,0 +1,27 @@ +pipeline { + agent any + + stages{ + stage('build'){ + steps{ + echo "compiling worker app") + dir('worker'){ + sh 'mvn compile' + } + } + } + } + stage('test'){ + steps{ + echo "running unit tests" + } + } + stage('package'){ + steps{ + echo "packaging worker app" + } + } + } + + +} \ No newline at end of file From 78e1dae641512f45e70b18fc1ff5b935d218e9e0 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 18:23:06 -0800 Subject: [PATCH 07/48] new --- worker/Jenkinsfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index b32df383d2..c927ff7136 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -13,12 +13,18 @@ pipeline { } stage('test'){ steps{ - echo "running unit tests" + echo "running unit tests" + dir('worker'){ + sh 'mvn clean test' + } } } stage('package'){ steps{ echo "packaging worker app" + dir('worker'){ + sh 'mvn package' + } } } } From 093e9b46f4098ddb349006993e688bdbff8a7d54 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 18:25:07 -0800 Subject: [PATCH 08/48] new --- worker/new | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 worker/new diff --git a/worker/new b/worker/new new file mode 100644 index 0000000000..e69de29bb2 From 032139df34c632517a7692d71688999609472013 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 18:32:05 -0800 Subject: [PATCH 09/48] new --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index c927ff7136..02fce72713 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stages{ stage('build'){ steps{ - echo "compiling worker app") + echo "compiling worker app" dir('worker'){ sh 'mvn compile' } From c7bfcc01b785328707050af35927952bbbf01c24 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 18:33:44 -0800 Subject: [PATCH 10/48] new --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 02fce72713..0f2ac15a72 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { } } } - } + stage('test'){ steps{ echo "running unit tests" From e43981b96ba585b18e80ad62874c2f666ed13004 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 19:00:45 -0800 Subject: [PATCH 11/48] new --- worker/new.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 worker/new.txt diff --git a/worker/new.txt b/worker/new.txt new file mode 100644 index 0000000000..e69de29bb2 From 7e3f29db9663e0118ef92ab1e8dc173d10ac3869 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 19:02:03 -0800 Subject: [PATCH 12/48] new --- worker/new.txt2 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 worker/new.txt2 diff --git a/worker/new.txt2 b/worker/new.txt2 new file mode 100644 index 0000000000..e69de29bb2 From 9631ddfb54da5c0f5662d6b285854cc5cd9c15ce Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 19:08:24 -0800 Subject: [PATCH 13/48] new --- worker/Jenkinsfile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 0f2ac15a72..e1afabac58 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -3,6 +3,9 @@ pipeline { stages{ stage('build'){ + when{ + branch 'master' + changeset "**/worker" steps{ echo "compiling worker app" dir('worker'){ @@ -12,6 +15,9 @@ pipeline { } stage('test'){ + when{ + branch 'master' + changeset "**/worker" steps{ echo "running unit tests" dir('worker'){ @@ -20,10 +26,15 @@ pipeline { } } stage('package'){ + when{ + branch 'master' + changeset "**/worker" + } steps{ echo "packaging worker app" dir('worker'){ - sh 'mvn package' + sh 'mvn package -dskipTests' + archiveArtifacts artifacts: '**/target/*.jar', fingerprint:True } } } From 328e3e530575fea9ede4b808eb77b3f5dd064e1a Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 19:13:44 -0800 Subject: [PATCH 14/48] tset --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 16dbfe085c..5e1e2505f0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ Voting App - +#making a change to thiso this application is based on Docker's example [voting app](https://github.com/docker/example-voting-app). From 9cb29ead4fafb5b279e1ac59e889a1ac9d63c690 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 19:14:45 -0800 Subject: [PATCH 15/48] tset --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e1e2505f0..c4c6e1ebc1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ Voting App -#making a change to thiso +#this is a sample voting app this application is based on Docker's example [voting app](https://github.com/docker/example-voting-app). From 5294b625634cd06dd646d3bd6fb827da1bd9f35b Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 19:16:50 -0800 Subject: [PATCH 16/48] tset --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4c6e1ebc1..f09b9ac438 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ Voting App -#this is a sample voting app +#this is a sample voting app again this application is based on Docker's example [voting app](https://github.com/docker/example-voting-app). From 01da7ffaf2d3dc6b5bac365df9671efe2423afcd Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 19:21:39 -0800 Subject: [PATCH 17/48] new --- worker/Jenkinsfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index e1afabac58..c878ae5f27 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,11 +1,15 @@ pipeline { agent any + tools { + maven 'maven 3.6.1' + } stages{ stage('build'){ when{ branch 'master' changeset "**/worker" + } steps{ echo "compiling worker app" dir('worker'){ @@ -18,6 +22,7 @@ pipeline { when{ branch 'master' changeset "**/worker" + } steps{ echo "running unit tests" dir('worker'){ From 0a5e9b36dd43bdd0b556ef1b69e27497cee25a08 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 19:24:45 -0800 Subject: [PATCH 18/48] new --- new.test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 new.test diff --git a/new.test b/new.test new file mode 100644 index 0000000000..e69de29bb2 From bd06c08cb4a3a90dffeea36e39c2126734a5e4f7 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Wed, 24 Feb 2021 19:29:21 -0800 Subject: [PATCH 19/48] new --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index c878ae5f27..bd1d136496 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent any tools { - maven 'maven 3.6.1' + maven 'maven' } stages{ stage('build'){ From 57aa42401eb737c24e92767dd7b9f056fa658d82 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 16:40:43 -0800 Subject: [PATCH 20/48] new --- result/new.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 result/new.txt diff --git a/result/new.txt b/result/new.txt new file mode 100644 index 0000000000..e69de29bb2 From 08f8e14a3d95e215492f8d0ea57e01cf73a05205 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 16:42:07 -0800 Subject: [PATCH 21/48] new --- worker/new1.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 worker/new1.txt diff --git a/worker/new1.txt b/worker/new1.txt new file mode 100644 index 0000000000..e69de29bb2 From a15ca8b87d46d9cc7e22bd440d1505a42e93e11a Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 16:43:26 -0800 Subject: [PATCH 22/48] new --- worker/Jenkinsfile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index bd1d136496..b64d6b87a6 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -6,10 +6,7 @@ pipeline { } stages{ stage('build'){ - when{ - branch 'master' - changeset "**/worker" - } + steps{ echo "compiling worker app" dir('worker'){ @@ -19,9 +16,7 @@ pipeline { } stage('test'){ - when{ - branch 'master' - changeset "**/worker" + } steps{ echo "running unit tests" @@ -31,9 +26,7 @@ pipeline { } } stage('package'){ - when{ - branch 'master' - changeset "**/worker" + } steps{ echo "packaging worker app" @@ -46,4 +39,8 @@ pipeline { } -} \ No newline at end of file +// } + +// when{ +// branch 'master' +// changeset "**/worker" \ No newline at end of file From 6f8feaf8a28ed081185399c6d4c36b1e878d5cda Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 16:44:01 -0800 Subject: [PATCH 23/48] new --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index b64d6b87a6..34cc616848 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { } stage('package'){ - } + steps{ echo "packaging worker app" dir('worker'){ From 18606ae3c3112e2cd83ccdae66160b7c5af297c4 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 16:44:46 -0800 Subject: [PATCH 24/48] new --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 34cc616848..7e3a41b9d3 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -37,7 +37,7 @@ pipeline { } } } - + } // } From 5693cf3939861b7e5ed9c0195627cce336f3832d Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 16:45:47 -0800 Subject: [PATCH 25/48] new --- worker/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 7e3a41b9d3..eefe2fa68f 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { stage('test'){ - } + steps{ echo "running unit tests" dir('worker'){ @@ -37,7 +37,7 @@ pipeline { } } } - } + // } From 3b4a9dff917c3466ba9e1e1b399b7db6ed71b810 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 16:46:45 -0800 Subject: [PATCH 26/48] new --- worker/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index eefe2fa68f..71e9a0a255 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -37,6 +37,7 @@ pipeline { } } } +} // } From 6a50782d8c9d7f6412beb8d226b2948f433d93b7 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 16:47:42 -0800 Subject: [PATCH 27/48] new --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 71e9a0a255..259d929079 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -31,7 +31,7 @@ pipeline { steps{ echo "packaging worker app" dir('worker'){ - sh 'mvn package -dskipTests' + sh 'mvn package -DskipTests' archiveArtifacts artifacts: '**/target/*.jar', fingerprint:True } } From d791c3c6fdd0867b19e1f9f0dc85dc05772bf0a5 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 16:54:38 -0800 Subject: [PATCH 28/48] new --- worker/Jenkinsfile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 259d929079..d984aff425 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -32,12 +32,26 @@ pipeline { echo "packaging worker app" dir('worker'){ sh 'mvn package -DskipTests' - archiveArtifacts artifacts: '**/target/*.jar', fingerprint:True + archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true } } } } -} + post{ + always{ + echo 'Building multibranch pipeline for worker is completed..' + } + failiure{ + 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 8309c634b007e232b0fbc9465abe9a9fa88827f2 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 16:56:20 -0800 Subject: [PATCH 29/48] new --- worker/Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index d984aff425..3f7babbdfa 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -42,8 +42,7 @@ pipeline { echo 'Building multibranch pipeline for worker is completed..' } failiure{ - slackSend (channel: "instavote-cd", message: "Build Failed - $ - {env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") + 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 817708e74bbaf8e2cc46c3ba57e82677331df8cc Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 16:56:57 -0800 Subject: [PATCH 30/48] new --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 3f7babbdfa..ff57db0063 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -41,7 +41,7 @@ pipeline { always{ echo 'Building multibranch pipeline for worker is completed..' } - failiure{ + failure{ slackSend (channel: "instavote-cd", message: "Build Failed - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)") } success{ From 3988edb196b0e5c36366de967c08c3445d96de46 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 17:36:16 -0800 Subject: [PATCH 31/48] new --- result/Jenkinsfile | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100755 result/Jenkinsfile diff --git a/result/Jenkinsfile b/result/Jenkinsfile new file mode 100755 index 0000000000..be68ba75ea --- /dev/null +++ b/result/Jenkinsfile @@ -0,0 +1,39 @@ +pipeline { + agent any + + tools { + nodejs 'node' + } + stages{ + stage('build'){ + when{ + + changeset "**/result/**" + } + steps{ + echo "compiling worker app" + dir('worker'){ + sh 'npm install' + + } + } + } + + stage('test'){ + when{ + + changeset "**/result/**" + } + steps{ + echo "running unit tests" + dir('worker'){ + sh 'npm install' + sh 'npm test' + + } + } + } + + } +} + From 3f960292eda29d1942c44078a4890610940886d2 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 17:40:19 -0800 Subject: [PATCH 32/48] new --- result/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index be68ba75ea..9361becf42 100755 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { } steps{ echo "compiling worker app" - dir('worker'){ + dir('result'){ sh 'npm install' } @@ -26,7 +26,7 @@ pipeline { } steps{ echo "running unit tests" - dir('worker'){ + dir('result'){ sh 'npm install' sh 'npm test' From 709e3acebfc5e13beb505bcc0b90636e13a74def Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 18:26:33 -0800 Subject: [PATCH 33/48] new --- result/Jenkinsfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index 9361becf42..713afe0a43 100755 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -1,5 +1,9 @@ pipeline { - agent any + agent { + docker{ + image 'node:8.16.0-alpine' + } + } tools { nodejs 'node' From eeb8b04ff8cbdcc51c7c5d05c143af12377b904d Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 18:43:43 -0800 Subject: [PATCH 34/48] new --- result/Jenkinsfile | 2 +- vote/Jenkinsfile | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 vote/Jenkinsfile diff --git a/result/Jenkinsfile b/result/Jenkinsfile index 713afe0a43..b5228abe9c 100755 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { docker{ - image 'node:8.16.0-alpine' + image 'node:8.16.-0-alpine' } } diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile new file mode 100644 index 0000000000..7ff76d4447 --- /dev/null +++ b/vote/Jenkinsfile @@ -0,0 +1,39 @@ +pipeline { + agent any + + docker{ + image 'python:2.7.16-slim' + } + } + stages{ + stage('build'){ + when{ + + changeset "**/vote/**" + } + steps{ + echo "compiling worker app" + dir('worker'){ + sh 'pip install -r requirements.txt' + + } + } + } + + stage('test'){ + when{ + + changeset "**/vote/**" + } + steps{ + echo "running unit tests" + dir('worker'){ + sh 'nosetests -v' + + } + } + } + + } +} + From d65ab570e6b5671e228f39995dc6843f6660279a Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 18:44:31 -0800 Subject: [PATCH 35/48] new --- vote/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index 7ff76d4447..8dc9f31b63 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { docker{ image 'python:2.7.16-slim' } - } + stages{ stage('build'){ when{ From 8b8df2b376a4ee64a07b9d30f99e67b0e6a77e96 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 18:47:31 -0800 Subject: [PATCH 36/48] new --- vote/Jenkinsfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index 8dc9f31b63..689edec00c 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -1,9 +1,10 @@ pipeline { - agent any - - docker{ - image 'python:2.7.16-slim' + agent { + docker{ + image 'python:2.7.16-slim' + } } + stages{ stage('build'){ From 3d181ad7188683dd078c8718f90d7c3d7923ca27 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 18:53:00 -0800 Subject: [PATCH 37/48] new --- vote/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index 689edec00c..942917e04c 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { } steps{ echo "compiling worker app" - dir('worker'){ + dir('vote'){ sh 'pip install -r requirements.txt' } @@ -28,7 +28,7 @@ pipeline { } steps{ echo "running unit tests" - dir('worker'){ + dir('vote'){ sh 'nosetests -v' } From 1aca1a26a8c08e909919281698e43de6b904989c Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 19:35:19 -0800 Subject: [PATCH 38/48] new --- worker/Jenkinsfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index ff57db0063..646c1af080 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,8 +1,11 @@ pipeline { - agent any - - tools { - maven 'maven' + agent{ + docker{ + image 'maven:3.6.1-jdk-8-slim' + args '-v $HOME/.m2/:/root/.m2' + } + } + } stages{ stage('build'){ From 55e6335f0c2058a5eb2c922af3f1c99af35a168f Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 19:37:04 -0800 Subject: [PATCH 39/48] new --- worker/Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 646c1af080..22aaf3e45e 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { } } - } + stages{ stage('build'){ @@ -52,7 +52,8 @@ pipeline { } } } - + + From 93801931a45c468ee9605b46d158ddc95feb283b Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 19:50:49 -0800 Subject: [PATCH 40/48] new --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 22aaf3e45e..b374324bbd 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent{ docker{ image 'maven:3.6.1-jdk-8-slim' - args '-v $HOME/.m2/:/root/.m2' + args '-v $HOME/.m2:/root/.m2' } } From 444e05015ac89752ebff1d980fe2053e0e85b377 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 20:00:08 -0800 Subject: [PATCH 41/48] new --- worker/Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index b374324bbd..292ab3f639 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -2,7 +2,8 @@ pipeline { agent{ docker{ image 'maven:3.6.1-jdk-8-slim' - args '-v $HOME/.m2:/root/.m2' + args '-v $HOME/.m2:/root/.m2:z -u root' + reuseNode true } } From 03eb23e6e6ddaa0b101339ce95fa8d15145893c8 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 20:20:31 -0800 Subject: [PATCH 42/48] new --- vote/Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index 942917e04c..a58315a056 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -38,3 +38,5 @@ pipeline { } } + + #comment From 548781cd3052f62f6d590fc4992a85a98b4ef3c1 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 20:21:04 -0800 Subject: [PATCH 43/48] new --- vote/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index a58315a056..2916e07c6c 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -39,4 +39,4 @@ pipeline { } - #comment +// #comment From 4a203d7d93d1f72b6c1ab5d44dbccdc897725e0a Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 20:24:43 -0800 Subject: [PATCH 44/48] new --- vote/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index 2916e07c6c..91dcbb3083 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -2,6 +2,7 @@ pipeline { agent { docker{ image 'python:2.7.16-slim' + args '-u root' } } From 35608da90e3a35bc7112a60fc51c1f286692af42 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Thu, 25 Feb 2021 20:27:55 -0800 Subject: [PATCH 45/48] new --- vote/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index 91dcbb3083..a026ceeb88 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -30,6 +30,7 @@ pipeline { steps{ echo "running unit tests" dir('vote'){ + sh 'pip install nose' sh 'nosetests -v' } From 67bed010ed11abbb351ad0c1d70b3820790973a6 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Fri, 26 Feb 2021 17:35:42 -0800 Subject: [PATCH 46/48] new --- result/Dockerfile | 4 ++-- result/Jenkinsfile | 1 + worker/Dockerfile | 19 +++++++++++++------ worker/Dockerfile.bak | 11 +++++++++++ worker/Dockerfile.java | 18 ++++++++++++++++++ 5 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 worker/Dockerfile.bak create mode 100644 worker/Dockerfile.java diff --git a/result/Dockerfile b/result/Dockerfile index d736db9db0..b336fe7704 100644 --- a/result/Dockerfile +++ b/result/Dockerfile @@ -10,7 +10,7 @@ RUN mv /app/node_modules /node_modules ADD . /app -ENV PORT 80 -EXPOSE 80 +#ENV PORT 80 +EXPOSE 4000 CMD ["node", "server.js"] diff --git a/result/Jenkinsfile b/result/Jenkinsfile index b5228abe9c..ba532494f5 100755 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -2,6 +2,7 @@ pipeline { agent { docker{ image 'node:8.16.-0-alpine' + args '-u root' } } diff --git a/worker/Dockerfile b/worker/Dockerfile index f64167cb73..f550d11a96 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -1,11 +1,18 @@ -FROM microsoft/dotnet:1.0.0-preview2-sdk +FROM java:openjdk-8-jdk-alpine + +RUN MAVEN_VERSION=3.3.3 \ + && cd /usr/share \ + && wget http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz -O - | tar xzf - \ + && mv /usr/share/apache-maven-$MAVEN_VERSION /usr/share/maven \ + && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn WORKDIR /code -ADD src/Worker /code/src/Worker +ADD pom.xml /code/pom.xml +RUN ["mvn", "dependency:resolve"] +RUN ["mvn", "verify"] -RUN dotnet restore -v minimal src/ \ - && dotnet publish -c Release -o ./ src/Worker/ \ - && rm -rf src/ $HOME/.nuget/ +ADD src/main /code/src/main +RUN ["mvn", "package"] +CMD ["java", "-jar", "target/worker-jar-with-dependencies.jar"] -CMD dotnet Worker.dll \ No newline at end of file diff --git a/worker/Dockerfile.bak b/worker/Dockerfile.bak new file mode 100644 index 0000000000..f64167cb73 --- /dev/null +++ b/worker/Dockerfile.bak @@ -0,0 +1,11 @@ +FROM microsoft/dotnet:1.0.0-preview2-sdk + +WORKDIR /code + +ADD src/Worker /code/src/Worker + +RUN dotnet restore -v minimal src/ \ + && dotnet publish -c Release -o ./ src/Worker/ \ + && rm -rf src/ $HOME/.nuget/ + +CMD dotnet Worker.dll \ No newline at end of file diff --git a/worker/Dockerfile.java b/worker/Dockerfile.java new file mode 100644 index 0000000000..f550d11a96 --- /dev/null +++ b/worker/Dockerfile.java @@ -0,0 +1,18 @@ +FROM java:openjdk-8-jdk-alpine + +RUN MAVEN_VERSION=3.3.3 \ + && cd /usr/share \ + && wget http://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz -O - | tar xzf - \ + && mv /usr/share/apache-maven-$MAVEN_VERSION /usr/share/maven \ + && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn + +WORKDIR /code + +ADD pom.xml /code/pom.xml +RUN ["mvn", "dependency:resolve"] +RUN ["mvn", "verify"] + +ADD src/main /code/src/main +RUN ["mvn", "package"] +CMD ["java", "-jar", "target/worker-jar-with-dependencies.jar"] + From 2e9b64813923e306af85da81b540b0b61bd744a3 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Fri, 26 Feb 2021 17:42:15 -0800 Subject: [PATCH 47/48] new --- worker/Dockerfile | 0 worker/Dockerfile.bak | 0 worker/Dockerfile.j | 0 worker/Dockerfile.java | 0 worker/Jenkinsfile | 20 +++++++++++++++++++- worker/README.md | 0 worker/codefresh.build.and.push.yml | 0 worker/codefresh.yml | 0 worker/new | 0 worker/new.txt | 0 worker/new.txt2 | 0 worker/new1.txt | 0 worker/pom.xml | 0 worker/src/Worker/Program.cs | 0 worker/src/Worker/project.json | 0 worker/src/main/java/worker/Worker.java | 0 16 files changed, 19 insertions(+), 1 deletion(-) mode change 100644 => 100755 worker/Dockerfile mode change 100644 => 100755 worker/Dockerfile.bak mode change 100644 => 100755 worker/Dockerfile.j mode change 100644 => 100755 worker/Dockerfile.java mode change 100644 => 100755 worker/Jenkinsfile mode change 100644 => 100755 worker/README.md mode change 100644 => 100755 worker/codefresh.build.and.push.yml mode change 100644 => 100755 worker/codefresh.yml mode change 100644 => 100755 worker/new mode change 100644 => 100755 worker/new.txt mode change 100644 => 100755 worker/new.txt2 mode change 100644 => 100755 worker/new1.txt mode change 100644 => 100755 worker/pom.xml mode change 100644 => 100755 worker/src/Worker/Program.cs mode change 100644 => 100755 worker/src/Worker/project.json mode change 100644 => 100755 worker/src/main/java/worker/Worker.java diff --git a/worker/Dockerfile b/worker/Dockerfile old mode 100644 new mode 100755 diff --git a/worker/Dockerfile.bak b/worker/Dockerfile.bak old mode 100644 new mode 100755 diff --git a/worker/Dockerfile.j b/worker/Dockerfile.j old mode 100644 new mode 100755 diff --git a/worker/Dockerfile.java b/worker/Dockerfile.java old mode 100644 new mode 100755 diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile old mode 100644 new mode 100755 index 292ab3f639..7b17a037db --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -37,10 +37,28 @@ pipeline { dir('worker'){ sh 'mvn package -DskipTests' archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true + } + } + } + + + stage('docker package'){ + + + steps{ + echo "docker package" + dir('worker'){ + script{ + docker.WithRegistry('https://index.docker.io/v1','dockerlogin') + } + def workerImage = docker.build("lexarflash8g/worker:{env.BUILD_ID}", "./worker") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + } } } } - } + post{ always{ echo 'Building multibranch pipeline for worker is completed..' diff --git a/worker/README.md b/worker/README.md old mode 100644 new mode 100755 diff --git a/worker/codefresh.build.and.push.yml b/worker/codefresh.build.and.push.yml old mode 100644 new mode 100755 diff --git a/worker/codefresh.yml b/worker/codefresh.yml old mode 100644 new mode 100755 diff --git a/worker/new b/worker/new old mode 100644 new mode 100755 diff --git a/worker/new.txt b/worker/new.txt old mode 100644 new mode 100755 diff --git a/worker/new.txt2 b/worker/new.txt2 old mode 100644 new mode 100755 diff --git a/worker/new1.txt b/worker/new1.txt old mode 100644 new mode 100755 diff --git a/worker/pom.xml b/worker/pom.xml old mode 100644 new mode 100755 diff --git a/worker/src/Worker/Program.cs b/worker/src/Worker/Program.cs old mode 100644 new mode 100755 diff --git a/worker/src/Worker/project.json b/worker/src/Worker/project.json old mode 100644 new mode 100755 diff --git a/worker/src/main/java/worker/Worker.java b/worker/src/main/java/worker/Worker.java old mode 100644 new mode 100755 From 88b1fe04ae430fca571498ba7d2517e3d8d866a2 Mon Sep 17 00:00:00 2001 From: lexarflash8g Date: Fri, 26 Feb 2021 17:46:10 -0800 Subject: [PATCH 48/48] new --- worker/Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 7b17a037db..4ca47977fd 100755 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -49,8 +49,7 @@ pipeline { echo "docker package" dir('worker'){ script{ - docker.WithRegistry('https://index.docker.io/v1','dockerlogin') - } + docker.WithRegistry('https://index.docker.io/v1','dockerlogin') } def workerImage = docker.build("lexarflash8g/worker:{env.BUILD_ID}", "./worker") workerImage.push() workerImage.push("${env.BRANCH_NAME}")