From a484e81ec839a54f7b6d3c41e935ef3ba944a28d Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 21:26:05 +0000 Subject: [PATCH 01/11] added dockerfiles for worker apps --- result/Jenkinsfile | 36 +++++++++++++++++++++ result/test/mock.test.js | 6 ++++ vote/Jenkinsfile | 36 +++++++++++++++++++++ vote/tests/test_frontend.py | 2 +- worker/Dockerfile | 11 +++++++ worker/Jenkinsfile | 9 ++++-- worker/src/test/java/worker/UnitWorker.java | 6 ++++ 7 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 result/Jenkinsfile create mode 100644 vote/Jenkinsfile create mode 100644 worker/Dockerfile diff --git a/result/Jenkinsfile b/result/Jenkinsfile new file mode 100644 index 0000000000..3f973cfc1e --- /dev/null +++ b/result/Jenkinsfile @@ -0,0 +1,36 @@ +pipeline { + agent { + docker { + image 'node:8.16.0-alpine' + } + } + + stages { + stage('build') { + when { + changeset '**/result/**' + } + steps { + dir('result') { + sh 'npm install' + } + } + } + stage('test') { + when { + changeset '**/result/**' + } + steps { + dir('result') { + sh 'npm install' + sh 'npm test' + } + } + } + } + post { + always { + echo 'This pipeline is completed now :-)' + } + } +} diff --git a/result/test/mock.test.js b/result/test/mock.test.js index f99dfdae97..17dddfaf4c 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 blah', () => { + it('unit test 5', () => { + expect(true).to.be.true; + }); +}); + diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile new file mode 100644 index 0000000000..d39ffc0ee8 --- /dev/null +++ b/vote/Jenkinsfile @@ -0,0 +1,36 @@ +pipeline { + agent { + docker { + image 'python:2.7.16-slim' + args '--user root' + } + } + + stages { + stage('build') { + when { + changeset '**/vote/**' + } + steps { + dir('vote') { + sh 'pip install -r requirements.txt' + } + } + } + stage('test') { + when { + changeset '**/vote/**' + } + steps { + dir('vote') { + sh 'nosetests -v' + } + } + } + } + post { + always { + echo 'This pipeline is completed now :-)' + } + } +} diff --git a/vote/tests/test_frontend.py b/vote/tests/test_frontend.py index 5e3d37a3d1..5a5b9a8306 100644 --- a/vote/tests/test_frontend.py +++ b/vote/tests/test_frontend.py @@ -12,7 +12,7 @@ def setUp(self): def test_home_status_code(self): - """Assert that the home page loads successfully""" + """Assert that the home page loadz successfully""" result = self.app.get('/') self.assertEqual(result.status_code, 200) diff --git a/worker/Dockerfile b/worker/Dockerfile new file mode 100644 index 0000000000..1264902a0f --- /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 diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 6c28e7d766..856b06a924 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,8 +1,11 @@ pipeline { agent any - tools{ - maven 'Maven 3.6.1' + agent { + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } } @@ -43,7 +46,7 @@ pipeline { post { always { - echo 'This pipeline is completed now :-)' + echo 'This pipeline is completed now' } } } diff --git a/worker/src/test/java/worker/UnitWorker.java b/worker/src/test/java/worker/UnitWorker.java index cb5d513961..a58f6b604d 100644 --- a/worker/src/test/java/worker/UnitWorker.java +++ b/worker/src/test/java/worker/UnitWorker.java @@ -22,4 +22,10 @@ void sample3() { void sample4() { } + + @Test + void sample5() { + + } + } From 9fc331353d0f7b593f703838aeaffe55db4891b2 Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 21:45:23 +0000 Subject: [PATCH 02/11] I docker image a build --- worker/Jenkinsfile | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 856b06a924..2488d3b22d 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -42,6 +42,25 @@ pipeline { } } } + + stage('docker-package') { + when { + branch 'master' + changeset '**/worker/**' + } + steps { + echo 'worker app with docker' + script { + docker.withRegistry('https://index.docker.io/v1', 'dockerlogin'){ + def workerImage = docker.build("robrockdataio/worker:v${env.BUILD_ID}","./worker") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + } + } + } + } + + } post { From 8f3456f83c5568166b67f4ab5c3effd2a08c9a9d Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 21:54:13 +0000 Subject: [PATCH 03/11] remove master branch --- worker/Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 2488d3b22d..4a3a9046d7 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -45,7 +45,6 @@ pipeline { stage('docker-package') { when { - branch 'master' changeset '**/worker/**' } steps { From 4b14e116f842ad2aa0b46f853e8c426bb067bac9 Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 22:14:12 +0000 Subject: [PATCH 04/11] I agent for multi --- worker/Jenkinsfile | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 4a3a9046d7..5556df0b43 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,16 +1,15 @@ pipeline { - agent any - - 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-9-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } when { changeset '**/worker/**' } @@ -21,7 +20,13 @@ pipeline { } } stage('test') { - when { + agent{ + docker { + image: 'maven:3.6.1-jdk-9-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + when { changeset '**/worker/**' } steps { @@ -31,7 +36,13 @@ pipeline { } } stage('package') { - when { + agent{ + docker { + image: 'maven:3.6.1-jdk-9-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + when { branch 'master' changeset '**/worker/**' } @@ -44,6 +55,7 @@ pipeline { } stage('docker-package') { + agent any when { changeset '**/worker/**' } From 8523968231aaf1bacce761aa27daf1224c0dac72 Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 22:20:19 +0000 Subject: [PATCH 05/11] I agent for multi d --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 5556df0b43..7e95b2f357 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -76,7 +76,7 @@ pipeline { post { always { - echo 'This pipeline is completed now' + echo 'This pipeline is completed now dockerized :-)' } } } From e89a812fe32c823e5b09895ab71f1fe31c440c45 Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 22:25:24 +0000 Subject: [PATCH 06/11] RemoVe colon --- worker/Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 7e95b2f357..8a50fae207 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { stage('build') { agent{ docker { - image: 'maven:3.6.1-jdk-9-alpine' + image 'maven:3.6.1-jdk-9-alpine' args '-v $HOME/.m2:/root/.m2' } } @@ -22,7 +22,7 @@ pipeline { stage('test') { agent{ docker { - image: 'maven:3.6.1-jdk-9-alpine' + image 'maven:3.6.1-jdk-9-alpine' args '-v $HOME/.m2:/root/.m2' } } @@ -38,7 +38,7 @@ pipeline { stage('package') { agent{ docker { - image: 'maven:3.6.1-jdk-9-alpine' + image 'maven:3.6.1-jdk-9-alpine' args '-v $HOME/.m2:/root/.m2' } } From e23573c8f9e4c510c9d6547b830d876c20f70d3a Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 22:27:50 +0000 Subject: [PATCH 07/11] version --- worker/Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 8a50fae207..5f4d9746ad 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { stage('build') { agent{ docker { - image 'maven:3.6.1-jdk-9-alpine' + image 'maven:3.6.1-jdk-8-alpine' args '-v $HOME/.m2:/root/.m2' } } @@ -22,7 +22,7 @@ pipeline { stage('test') { agent{ docker { - image 'maven:3.6.1-jdk-9-alpine' + image 'maven:3.6.1-jdk-8-alpine' args '-v $HOME/.m2:/root/.m2' } } @@ -38,7 +38,7 @@ pipeline { stage('package') { agent{ docker { - image 'maven:3.6.1-jdk-9-alpine' + image 'maven:3.6.1-jdk-8-alpine' args '-v $HOME/.m2:/root/.m2' } } From 683d7d709b4663d0218b311645c97281ecdea9cc Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 22:34:14 +0000 Subject: [PATCH 08/11] version --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 5f4d9746ad..076f099fbc 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -76,7 +76,7 @@ pipeline { post { always { - echo 'This pipeline is completed now dockerized :-)' + echo 'This pipeline is completed now dockerized >-)' } } } From f1ccbe6fe3e47559d3f78c17c78d892745c679fc Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 22:41:20 +0000 Subject: [PATCH 09/11] version --- worker/Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 076f099fbc..518de5122f 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -65,7 +65,6 @@ pipeline { docker.withRegistry('https://index.docker.io/v1', 'dockerlogin'){ def workerImage = docker.build("robrockdataio/worker:v${env.BUILD_ID}","./worker") workerImage.push() - workerImage.push("${env.BRANCH_NAME}") } } } From a3b05bb9978bde0e1b5318581872843388797b08 Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 22:47:06 +0000 Subject: [PATCH 10/11] version --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 518de5122f..7e3d3a0571 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -62,7 +62,7 @@ pipeline { steps { echo '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("robrockdataio/worker:v${env.BUILD_ID}","./worker") workerImage.push() } From 6ba6f2d4dd709d39c7ff89611dabd471f9b5632e Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 22:55:36 +0000 Subject: [PATCH 11/11] package --- worker/Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 7e3d3a0571..8849df5b40 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -58,6 +58,7 @@ pipeline { agent any when { changeset '**/worker/**' + branch 'master' } steps { echo 'worker app with docker' @@ -65,6 +66,7 @@ pipeline { docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin'){ def workerImage = docker.build("robrockdataio/worker:v${env.BUILD_ID}","./worker") workerImage.push() + workerImage.push("${env.BRANCH_NAME}") } } }