diff --git a/README.md b/README.md index b8ad8a94af..74c8dbecf1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Example Voting App ========= +This a test + Getting started --------------- diff --git a/result/Jenkinsfile b/result/Jenkinsfile new file mode 100644 index 0000000000..0d6e512b45 --- /dev/null +++ b/result/Jenkinsfile @@ -0,0 +1,60 @@ +pipeline { + agent none + + stages { + stage('build') { + agent { + docker { + image 'node:8.16.0-alpine' + } + } + when { + changeset '**/result/**' + } + steps { + dir('result') { + sh 'npm install' + } + } + } + stage('test') { + agent { + docker { + image 'node:8.16.0-alpine' + } + } + when { + changeset '**/result/**' + } + steps { + dir('result') { + sh 'npm install' + sh 'npm test' + } + } + } + stage('docker-package') { + agent any + when { + changeset '**/result/**' + branch 'master' + } + steps { + echo 'worker app with docker' + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin'){ + def workerImage = docker.build("robrockdataio/result:v${env.BUILD_ID}","./result") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + } + } + } + } + + } + 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..adf8e9b202 --- /dev/null +++ b/vote/Jenkinsfile @@ -0,0 +1,63 @@ +pipeline { + agent none + + stages { + stage('build') { + agent { + docker { + image 'python:2.7.16-slim' + args '--user root' + } + } + when { + changeset '**/vote/**' + } + steps { + dir('vote') { + sh 'pip install -r requirements.txt' + } + } + } + stage('test') { + agent { + docker { + image 'python:2.7.16-slim' + args '--user root' + } + } + when { + changeset '**/vote/**' + } + steps { + dir('vote') { + sh 'nosetests -v' + } + } + } + + stage('docker-package') { + agent any + when { + changeset '**/vote/**' + branch 'master' + } + steps { + echo 'worker app with docker' + script { + docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin'){ + def workerImage = docker.build("robrockdataio/vote:v${env.BUILD_ID}","./vote") + workerImage.push() + workerImage.push("${env.BRANCH_NAME}") + } + } + } + } + + + } + post { + always { + echo 'This pipeline is completed now :-)' + } + } +} diff --git a/vote/app.py b/vote/app.py index db5ff2e4d8..1eb1228adb 100644 --- a/vote/app.py +++ b/vote/app.py @@ -20,6 +20,7 @@ def get_redis(): @app.route("/", methods=['POST','GET']) def hello(): voter_id = request.cookies.get('voter_id') + # test comment now if not voter_id: voter_id = hex(random.getrandbits(64))[2:-1] 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 new file mode 100644 index 0000000000..53d19cea2c --- /dev/null +++ b/worker/Jenkinsfile @@ -0,0 +1,84 @@ +pipeline { + + agent none + + stages { + stage('build') { + agent{ + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + when { + changeset '**/worker/**' + } + steps { + dir('worker') { + sh 'mvn compile' + } + } + } + stage('test') { + agent{ + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + when { + changeset '**/worker/**' + } + steps { + dir('worker') { + sh 'mvn clean test' + } + } + } + stage('package') { + agent{ + docker { + image 'maven:3.6.1-jdk-8-alpine' + args '-v $HOME/.m2:/root/.m2' + } + } + when { + branch 'master' + changeset '**/worker/**' + } + steps { + dir('worker') { + sh 'mvn package -DskipTests' + archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true + } + } + } + + stage('docker-package') { + agent any + when { + changeset '**/worker/**' + branch 'master' + } + 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 { + always { + echo 'This pipeline is completed now dockerized >-) >-) >-)' + + } + } +} 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 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() { + + } + }