From b0c7e735eda15ab813966bf24e4b9a46e875b531 Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 10:20:01 +0000 Subject: [PATCH 01/12] added jenkins file for result app --- result/Jenkinsfile | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 result/Jenkinsfile diff --git a/result/Jenkinsfile b/result/Jenkinsfile new file mode 100644 index 0000000000..f174163de7 --- /dev/null +++ b/result/Jenkinsfile @@ -0,0 +1,37 @@ +pipeline { + agent any + + tools{ + maven 'NodeJS 8.9.0' + } + + + 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 :-)' + } + } +} From c801885527848e385bebdb7ce0cc1c17fe002bab Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 10:30:57 +0000 Subject: [PATCH 02/12] added a dev test --- 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 5614c9b9b4a74ff86268cd0c5310ea7d2ad281f2 Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 10:38:18 +0000 Subject: [PATCH 03/12] fix nodejs bug --- result/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index f174163de7..24112f7044 100644 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent any tools{ - maven 'NodeJS 8.9.0' + nodejs 'NodeJS 8.9.0' } From c223aec2f3421015349b19ac8b6a8f44ac0e49e3 Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 11:03:21 +0000 Subject: [PATCH 04/12] blah blah --- result/test/mock.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/result/test/mock.test.js b/result/test/mock.test.js index bdcd486e79..17dddfaf4c 100644 --- a/result/test/mock.test.js +++ b/result/test/mock.test.js @@ -26,7 +26,7 @@ describe('mock test 4', () => { }); }); -describe('mock test 5', () => { +describe('mock test 5 blah', () => { it('unit test 5', () => { expect(true).to.be.true; }); From e27303857f04decb88675d5fbd73e61ba1f4a3c0 Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 18:41:57 +0000 Subject: [PATCH 05/12] user docker agent insted of maven --- worker/Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 6c28e7d766..8589da58e7 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -1,11 +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' + } } - stages { stage('build') { when { From a57084858546edc277a76deffb237cfd2eb12db4 Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 18:51:35 +0000 Subject: [PATCH 06/12] user docker agent insted of maven obs --- worker/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile index 8589da58e7..8c479ee89a 100644 --- a/worker/Jenkinsfile +++ b/worker/Jenkinsfile @@ -43,7 +43,7 @@ pipeline { post { always { - echo 'This pipeline is completed now :-)' + echo 'This pipeline is completed now :-) :-) :-)' } } } From 08d4db840fef067b2c26ee31530c397d439f2637 Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 19:04:18 +0000 Subject: [PATCH 07/12] implement test 5 --- worker/src/test/java/worker/UnitWorker.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 f8f96d8190c3658cb69326e80d3ff7f7bce9a7bd Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 19:12:25 +0000 Subject: [PATCH 08/12] docker for node app --- result/Jenkinsfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index 24112f7044..631a22326f 100644 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -1,11 +1,10 @@ pipeline { - agent any - - tools{ - nodejs 'NodeJS 8.9.0' + agent { + docker { + image 'node:8.16.0-alpha' + } } - stages { stage('build') { when { From dbb8f498ecc20f59d1936f3235183de824fa704e Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 19:14:00 +0000 Subject: [PATCH 09/12] docker for node app again --- result/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/result/Jenkinsfile b/result/Jenkinsfile index 631a22326f..3f973cfc1e 100644 --- a/result/Jenkinsfile +++ b/result/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { docker { - image 'node:8.16.0-alpha' + image 'node:8.16.0-alpine' } } From bfc023f4975b6571ed9031296f53618c9003532f Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 19:27:18 +0000 Subject: [PATCH 10/12] start autobuild file --- vote/Jenkinsfile | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 vote/Jenkinsfile diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile new file mode 100644 index 0000000000..ec6d5153a2 --- /dev/null +++ b/vote/Jenkinsfile @@ -0,0 +1,35 @@ +pipeline { + agent { + docker { + image 'python:2.7.16-slim' + } + } + + 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 :-)' + } + } +} From ef2ed91fee655260c6d20fba1d59692c735adb3f Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 19:39:22 +0000 Subject: [PATCH 11/12] load --- vote/tests/test_frontend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 22c494f0e56ad9ae65b26d84f5dfe76a1f375463 Mon Sep 17 00:00:00 2001 From: "robert.siwicki@googlemail.com" Date: Sat, 22 Jan 2022 19:43:03 +0000 Subject: [PATCH 12/12] root user --- vote/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/vote/Jenkinsfile b/vote/Jenkinsfile index ec6d5153a2..d39ffc0ee8 100644 --- a/vote/Jenkinsfile +++ b/vote/Jenkinsfile @@ -2,6 +2,7 @@ pipeline { agent { docker { image 'python:2.7.16-slim' + args '--user root' } }