From 9a7c5e3494494b2359099a6b4e1b4af354556807 Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Thu, 27 Oct 2022 21:11:06 +0200 Subject: [PATCH 01/24] Create Jenkinsfile Added Jenkinsfile for worker --- 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..2f86db81d8 --- /dev/null +++ b/worker/Jenkinsfile @@ -0,0 +1,35 @@ +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 Tests on worker app' + sleep 9 + } + } + stage('package') { + steps { + echo 'Packageging worker app' + sleep 5 + } + } + } + post { + always{ + echo 'Build pipeline for worker is complete..' + } + } +} From bdb3dc1878916b49327195e3fe5e460927efc488 Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Thu, 27 Oct 2022 21:20:47 +0200 Subject: [PATCH 02/24] Update Jenkinsfile --- worker/.project | 11 +++++++++++ worker/.settings/org.eclipse.jdt.core.prefs | 2 ++ worker/Jenkinsfile | 10 +++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/worker/.project b/worker/.project index 49e0d9af10..99669e1dbb 100644 --- a/worker/.project +++ b/worker/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + 1666897974092 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/worker/.settings/org.eclipse.jdt.core.prefs b/worker/.settings/org.eclipse.jdt.core.prefs index 1eb325ec7e..b11489fa64 100644 --- a/worker/.settings/org.eclipse.jdt.core.prefs +++ b/worker/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.processAnnotations=disabled org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.7 diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 2f86db81d8..dacae225dc 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -17,19 +17,23 @@ pipeline { stage('test') { steps { echo 'Running Unit Tests on worker app' - sleep 9 + dir('worker'){ + sh 'mvn clean test' + } } } stage('package') { steps { echo 'Packageging worker app' - sleep 5 + dir('worker'){ + sh 'mvn package' + } } } } post { always{ - echo 'Build pipeline for worker is complete..' + echo 'Pipeline for worker is complete..' } } } From fbcb50eaa5feda1c41f800bcebe8382c785ce3cf Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Thu, 27 Oct 2022 21:24:22 +0200 Subject: [PATCH 03/24] Test --- worker/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index dacae225dc..e424f37cb9 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -31,6 +31,7 @@ pipeline { } } } + post { always{ echo 'Pipeline for worker is complete..' From a5af568575b8a62b74fb28923a4450c387e221b6 Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Thu, 27 Oct 2022 21:32:31 +0200 Subject: [PATCH 04/24] added archive step --- worker/Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index e424f37cb9..80badfda93 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -26,14 +26,15 @@ pipeline { steps { echo 'Packageging worker app' dir('worker'){ - sh 'mvn package' + sh 'mvn package -DskipTests' } } } } - + post { always{ + archiveArtifacts artifacts: '**/target*.jar', fingerprint: true echo 'Pipeline for worker is complete..' } } From 3b6a2da98796a3f170f652874821891deecac65c Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Tue, 1 Nov 2022 16:49:08 +0100 Subject: [PATCH 05/24] Added Jenkinsfile for NodeJS app --- result/Jenkinsfile | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 result/Jenkinsfile diff --git a/result/Jenkinsfile b/result/Jenkinsfile new file mode 100644 index 0000000000..e1adef736e --- /dev/null +++ b/result/Jenkinsfile @@ -0,0 +1,33 @@ +pipeline { + agent any + + tools { + nodejs 'NodeJS 8.9.0' + } + + 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 on worker app' + dir('worker'){ + sh 'npm install' + sh 'npm test' + } + } + } + } +} From 7e0064bb58a0f3c40d445bcc2d6cd027f9368eff Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Tue, 1 Nov 2022 23:18:43 +0100 Subject: [PATCH 06/24] use docker agent instead of maven tools --- worker/Jenkinsfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 80badfda93..c2028ef91c 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,8 +1,9 @@ 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' + } } stages { From 6da71a0935ec370d1a862673748679e35f656f8f Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Thu, 3 Nov 2022 21:01:45 +0100 Subject: [PATCH 07/24] Added another test --- 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 cb5d513961..7fd45c4b18 100644 --- a/worker/src/test/java/worker/UnitWorker.java +++ b/worker/src/test/java/worker/UnitWorker.java @@ -22,4 +22,9 @@ void sample3() { void sample4() { } + + @Test + void sample5() { + + } } From 225a8e62a377bda0397e50293913b381024c3863 Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Thu, 3 Nov 2022 21:17:01 +0100 Subject: [PATCH 08/24] Updated NodeJS declarative pipeline --- result/Jenkinsfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index e1adef736e..e87c8e9d0d 100644 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -1,5 +1,9 @@ pipeline { - agent any + agent { + docker { + image 'node:14.21-alpine3.15' + } + } tools { nodejs 'NodeJS 8.9.0' @@ -12,7 +16,7 @@ pipeline { } steps { echo 'Compiling worker app' - dir('worker'){ + dir('result'){ sh 'npm install' } } @@ -23,7 +27,7 @@ pipeline { } steps { echo 'Running Unit Tests on worker app' - dir('worker'){ + dir('result'){ sh 'npm install' sh 'npm test' } From f04d6ec75f032abb386c284aad39348766ad07fc Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Thu, 3 Nov 2022 21:19:31 +0100 Subject: [PATCH 09/24] Update --- worker/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index c2028ef91c..669a17b078 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -6,6 +6,7 @@ pipeline { } } + stages { stage('build') { steps { From 7073f273e03f932cae1aa68fe253e3615e74ec2d Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Thu, 3 Nov 2022 22:00:32 +0100 Subject: [PATCH 10/24] Added Jenkinsfile for vote app --- vote/Jenkinsfile | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 vote/Jenkinsfile diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile new file mode 100644 index 0000000000..20fe12f4ef --- /dev/null +++ b/vote/Jenkinsfile @@ -0,0 +1,36 @@ +pipeline { + agent { + docker { + image 'python:2.7.16-slim' + } + } + + tools { + nodejs 'NodeJS 8.9.0' + } + + stages { + stage('build') { + when{ + changeset "**/vote/**" + } + steps { + echo 'Compiling worker app' + dir('vote'){ + sh 'pip install -r requirements.txt' + } + } + } + stage('test') { + when { + changeset "**/vote/**" + } + steps { + echo 'Running Unit Tests on worker app' + dir('vote'){ + sh 'nosetests -v' + } + } + } + } +} From d7d741f587cc297512fb032f0fbc25244c59449f Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Thu, 3 Nov 2022 22:54:15 +0100 Subject: [PATCH 11/24] Go fuck yourself --- vote/tests/test_frontend.py | 1 - 1 file changed, 1 deletion(-) diff --git a/vote/tests/test_frontend.py b/vote/tests/test_frontend.py index 5e3d37a3d1..1171e29d7f 100644 --- a/vote/tests/test_frontend.py +++ b/vote/tests/test_frontend.py @@ -10,7 +10,6 @@ def setUp(self): self.app = app.test_client() self.app.testing = True - def test_home_status_code(self): """Assert that the home page loads successfully""" result = self.app.get('/') From 8086060aa99475e1c22c4c42d26c2cf0e4b8c2b2 Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Thu, 3 Nov 2022 23:25:02 +0100 Subject: [PATCH 12/24] Update --- vote/tests/test_frontend.py | 1 + 1 file changed, 1 insertion(+) diff --git a/vote/tests/test_frontend.py b/vote/tests/test_frontend.py index 1171e29d7f..929f0e60fe 100644 --- a/vote/tests/test_frontend.py +++ b/vote/tests/test_frontend.py @@ -27,3 +27,4 @@ def test_processed_by_is_set(self): if __name__ == '__main__': unittest.main() + From 0d23a78f4be444dc36b858aa0ffe80c1e8878880 Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Sat, 5 Nov 2022 16:35:57 +0100 Subject: [PATCH 13/24] Added Dockerfile --- worker/Dockerfile | 11 +++++++++++ .../target/test-classes/worker/UnitWorker.class | Bin 0 -> 966 bytes 2 files changed, 11 insertions(+) create mode 100644 worker/Dockerfile create mode 100644 worker/target/test-classes/worker/UnitWorker.class 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/target/test-classes/worker/UnitWorker.class b/worker/target/test-classes/worker/UnitWorker.class new file mode 100644 index 0000000000000000000000000000000000000000..73030cccfcdb525e3a49fd4e4643962f8b69ce43 GIT binary patch literal 966 zcmbVK!EO^V5PeS5BwYe&Qd%elWO6DOR8T?r`%kKcITJdfY()$fa601olAiJCz7yLG4J!V{zY*K62BU0`#j&QzEx zlZ2ngGm5=HjBS?dRC#TU z%$*&ll)aY0#&Ak>)~;0BT~V!DsrG0^wVg_} Ry%p8=D%AK7W8Z6d@(0hpt*!t7 literal 0 HcmV?d00001 From 554d46103a4c732f310fc0ae81ef6e25ddd4809b Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Sun, 6 Nov 2022 19:02:26 +0100 Subject: [PATCH 14/24] Added docker package stage --- worker/Jenkinsfile | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 669a17b078..e6a30c790f 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -25,10 +25,31 @@ pipeline { } } stage('package') { + when{ + branch 'master' + chnageset "**/worker/**" + } steps { echo 'Packageging worker app' dir('worker'){ sh 'mvn package -DskipTests' + archiveArtifacts artifacts: '**/target*.jar', fingerprint: true + } + } + } + stage('docker-package') { + when{ + branch 'master' + chnageset "**/worker/**" + } + steps { + echo 'Packaging worker app with docker' + sript{ + docker.withRegistry('https://index.docker.io/v1', 'dockerlogin'){ + def workerImage = docker.build("slobodaandrej/worker:v${env.BUILD_ID}", "worker") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + } } } } @@ -36,7 +57,6 @@ pipeline { post { always{ - archiveArtifacts artifacts: '**/target*.jar', fingerprint: true echo 'Pipeline for worker is complete..' } } From ce8dbb0a442179c7dd2c0e259c179dfd80e8ea76 Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Sun, 6 Nov 2022 21:31:21 +0100 Subject: [PATCH 15/24] Added docker package stage --- worker/Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index e6a30c790f..fae41dba53 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -39,7 +39,6 @@ pipeline { } stage('docker-package') { when{ - branch 'master' chnageset "**/worker/**" } steps { From fb48e1194c72393faa5ae571b752df4e31676b36 Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Sun, 6 Nov 2022 21:31:58 +0100 Subject: [PATCH 16/24] Added docker package stage --- worker/Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index fae41dba53..7172e34394 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -53,7 +53,6 @@ pipeline { } } } - post { always{ echo 'Pipeline for worker is complete..' From e7417b0c9d185eaf512a93d22041c7c4f0030b14 Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Sun, 6 Nov 2022 21:37:16 +0100 Subject: [PATCH 17/24] Updated worker Jenkinsfile --- worker/Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 7172e34394..4962b5439f 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -5,8 +5,6 @@ pipeline { args '-v $HOME/.m2:/root/.m2' } } - - stages { stage('build') { steps { From 95827bc2b18b352dcd88c1ae52327abb28d036be Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Sun, 6 Nov 2022 21:39:12 +0100 Subject: [PATCH 18/24] Updated tests --- worker/src/test/java/worker/UnitWorker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/src/test/java/worker/UnitWorker.java b/worker/src/test/java/worker/UnitWorker.java index 7fd45c4b18..0942cd5f5d 100644 --- a/worker/src/test/java/worker/UnitWorker.java +++ b/worker/src/test/java/worker/UnitWorker.java @@ -27,4 +27,4 @@ void sample4() { void sample5() { } -} +} \ No newline at end of file From 49272079ba041508035c8bf99346ffefaf322076 Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Sun, 6 Nov 2022 21:40:08 +0100 Subject: [PATCH 19/24] Update --- worker/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 4962b5439f..a25087a136 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -57,3 +57,4 @@ pipeline { } } } + From d216328304421330bcc786836eb6eb56532601f7 Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Sun, 6 Nov 2022 21:53:32 +0100 Subject: [PATCH 20/24] Updated Jenkinsfile --- worker/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index a25087a136..9f7e6b4148 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -38,6 +38,7 @@ pipeline { stage('docker-package') { when{ chnageset "**/worker/**" + branch "master" } steps { echo 'Packaging worker app with docker' From 4680a688ac7f777d44e691c6614b0bd7851e26bf Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Sun, 6 Nov 2022 22:06:45 +0100 Subject: [PATCH 21/24] Update --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 9f7e6b4148..9c6f23f795 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -25,7 +25,7 @@ pipeline { stage('package') { when{ branch 'master' - chnageset "**/worker/**" + changeset "**/worker/**" } steps { echo 'Packageging worker app' From d507fe6680522ceb5f6fe1755081f18b0bee418f Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Sun, 6 Nov 2022 22:29:59 +0100 Subject: [PATCH 22/24] Added agent per stage --- result/Jenkinsfile | 26 +++++++-- vote/Jenkinsfile | 46 ++++++++++++---- worker/Jenkinsfile | 129 +++++++++++++++++++++++++++------------------ 3 files changed, 136 insertions(+), 65 deletions(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index e87c8e9d0d..d5e2a40af3 100644 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -4,11 +4,6 @@ pipeline { image 'node:14.21-alpine3.15' } } - - tools { - nodejs 'NodeJS 8.9.0' - } - stages { stage('build') { when{ @@ -33,5 +28,26 @@ pipeline { } } } + stage('docker-package') { + when{ + changeset "**/result/**" + branch "master" + } + steps { + echo 'Packaging result app with docker' + sript{ + docker.withRegistry('https://index.docker.io/v1', 'dockerlogin'){ + def workerImage = docker.build("slobodaandrej/result:v${env.BUILD_ID}", "./result") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + } + } + } + } + } + post { + always{ + echo 'Pipeline for result is complete..' + } } } diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index 20fe12f4ef..da76681ef9 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -1,16 +1,15 @@ pipeline { - agent { - docker { - image 'python:2.7.16-slim' - } - } - - tools { - nodejs 'NodeJS 8.9.0' - } + agent none stages { + agent { + docker { + image 'python:2.7.16-slim' + args '--user root' + } + } stage('build') { + when{ changeset "**/vote/**" } @@ -22,15 +21,42 @@ pipeline { } } stage('test') { + agent { + docker { + image 'python:2.7.16-slim' + args '--user root' + } + } when { changeset "**/vote/**" } steps { - echo 'Running Unit Tests on worker app' + echo 'Running Unit Tests on vote app' dir('vote'){ sh 'nosetests -v' } } } + stage('docker-package') { + when{ + changeset "**/vote/**" + branch "master" + } + steps { + echo 'Packaging vote app with docker' + sript{ + docker.withRegistry('https://index.docker.io/v1', 'dockerlogin'){ + def workerImage = docker.build("slobodaandrej/vote:v${env.BUILD_ID}", "./vote") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + } + } + } + } + } + post { + always{ + echo 'Pipeline for vote is complete..' + } } } diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 9c6f23f795..882cfd690c 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,61 +1,90 @@ pipeline { - agent { - docker { - image: 'maven:3.6.1-jdk-8-alpine' + + agent none + + stages{ + stage("build"){ + when{ + changeset "**/worker/**" + } + + agent{ + docker{ + image 'maven:3.6.1-jdk-8-slim' args '-v $HOME/.m2:/root/.m2' + } } - } - stages { - stage('build') { - steps { - echo 'Compiling worker app' - dir('worker'){ - sh 'mvn compile' - } - } + + steps{ + echo 'Compiling worker app..' + dir('worker'){ + sh 'mvn compile' + } } - stage('test') { - steps { - echo 'Running Unit Tests on worker app' - dir('worker'){ - sh 'mvn clean test' - } - } + } + stage("test"){ + when{ + changeset "**/worker/**" } - stage('package') { - when{ - branch 'master' - changeset "**/worker/**" - } - steps { - echo 'Packageging worker app' - dir('worker'){ - sh 'mvn package -DskipTests' - archiveArtifacts artifacts: '**/target*.jar', fingerprint: true - } - } + agent{ + docker{ + image 'maven:3.6.1-jdk-8-slim' + args '-v $HOME/.m2:/root/.m2' + } } - stage('docker-package') { - when{ - chnageset "**/worker/**" - branch "master" - } - steps { - echo 'Packaging worker app with docker' - sript{ - docker.withRegistry('https://index.docker.io/v1', 'dockerlogin'){ - def workerImage = docker.build("slobodaandrej/worker:v${env.BUILD_ID}", "worker") - workerImage.push() - workerImage.push("${env.BRANCH_NAME}") - } - } - } + steps{ + echo 'Running Unit Tets on worker app..' + dir('worker'){ + sh 'mvn clean test' + } + + } + } + stage("package"){ + when{ + branch 'master' + changeset "**/worker/**" } - } - post { - always{ - echo 'Pipeline for worker is complete..' + agent{ + docker{ + image 'maven:3.6.1-jdk-8-slim' + args '-v $HOME/.m2:/root/.m2' + } } + steps{ + echo 'Packaging worker app' + dir('worker'){ + sh 'mvn package -DskipTests' + archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true + } + + } + } + + stage('docker-package'){ + agent any + when{ + changeset "**/worker/**" + branch 'master' + } + steps{ + echo 'Packaging worker app with docker' + script{ + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') { + def workerImage = docker.build("initcron/worker:v${env.BUILD_ID}", "./worker") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + workerImage.push("latest") + } + } + } + } + } + + post{ + always{ + echo 'Building multibranch pipeline for worker is completed..' } + } } From 068db3cd88d46d6c927795290d3dd4820d329c67 Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Sun, 6 Nov 2022 22:40:35 +0100 Subject: [PATCH 23/24] Updated Jenkinsfiles --- result/Jenkinsfile | 18 +++++++++++++----- vote/Jenkinsfile | 2 ++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index d5e2a40af3..ce1174e2fb 100644 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -1,10 +1,12 @@ pipeline { - agent { - docker { - image 'node:14.21-alpine3.15' - } - } + agent none + stages { + agent { + docker { + image 'node:14.21-alpine3.15' + } + } stage('build') { when{ changeset "**/result/**" @@ -17,6 +19,11 @@ pipeline { } } stage('test') { + agent { + docker { + image 'node:14.21-alpine3.15' + } + } when { changeset "**/result/**" } @@ -29,6 +36,7 @@ pipeline { } } stage('docker-package') { + agent any when{ changeset "**/result/**" branch "master" diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index da76681ef9..3ac184b779 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -33,11 +33,13 @@ pipeline { steps { echo 'Running Unit Tests on vote app' dir('vote'){ + sh 'pip install -r requirements.txt' sh 'nosetests -v' } } } stage('docker-package') { + agent any when{ changeset "**/vote/**" branch "master" From 2543a5176efc97f56a75213a10ad1acefe4a8d0f Mon Sep 17 00:00:00 2001 From: andrejsloboda <88687893+andrejsloboda@users.noreply.github.com> Date: Sun, 6 Nov 2022 22:51:09 +0100 Subject: [PATCH 24/24] Fixed Jenkinsfiles --- result/Jenkinsfile | 11 +++++------ vote/Jenkinsfile | 14 ++++++-------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index ce1174e2fb..269f1f00a6 100644 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -1,13 +1,12 @@ pipeline { agent none - stages { - agent { - docker { - image 'node:14.21-alpine3.15' - } - } stage('build') { + agent { + docker { + image 'node:14.21-alpine3.15' + } + } when{ changeset "**/result/**" } diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index 3ac184b779..d2243ccf5a 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -1,15 +1,13 @@ pipeline { agent none - 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/**" }