Initcron patch 1

README.md

@@ -1,6 +1,8 @@
 Example Voting App
 =========
 
+Test 4
+
 Getting started
 ---------------
 

e2e/.env

@@ -0,0 +1,3 @@
+VOTE_IMAGE=initcron/vote:master
+WORKER_IMAGE=initcron/worker:master
+RESULT_IMAGE=initcron/result:master

e2e/docker-compose.test.yml → e2e/docker-compose.yml

@@ -2,17 +2,19 @@ version: '2'
 
 services:
 
-  sut:
+  e2e:
     build: ./tests/
     depends_on:
       - vote
       - result
       - worker
+      - db
+      - redis
     networks:
       - front-tier
 
   vote:
-    build: ../vote/
+    image: ${VOTE_IMAGE}
     ports: ["80"]
     depends_on:
       - redis
@@ -22,7 +24,7 @@ services:
       - back-tier
 
   result:
-    build: .
+    image: ${RESULT_IMAGE}
     ports: ["80"]
     depends_on:
       - redis
@@ -32,7 +34,7 @@ services:
       - back-tier
 
   worker:
-    build: ../worker/
+    image: ${WORKER_IMAGE}
     depends_on:
       - redis
       - db
@@ -47,8 +49,6 @@ services:
 
   db:
     image: postgres:9.4
-    volumes:
-      - "db-data:/var/lib/postgresql/data"
     networks:
       - back-tier
 

e2e/tests/tests.sh

@@ -1,13 +1,31 @@
-#!/bin/sh
+#!/bin/bash
 
 while ! timeout 1 bash -c "echo > /dev/tcp/vote/80"; do
     sleep 1
 done
 
+current=`phantomjs render.js http://result | grep -i vote | cut -d ">" -f 4 | cut -d " " -f1`
+next=`echo "$(($current + 1))"`
+
+  echo -e "\n\n-----------------"
+  echo -e "Current Votes Count: $current"
+  echo -e "-----------------\n"
+
+echo -e " I: Submitting one more vote...\n"
+
 curl -sS -X POST --data "vote=b" http://vote > /dev/null
 sleep 10
 
-if phantomjs render.js http://result | grep -q '1 vote'; then
+new=`phantomjs render.js http://result | grep -i vote | cut -d ">" -f 4 | cut -d " " -f1`
+
+
+  echo -e "\n\n-----------------"
+  echo -e "New Votes Count: $new"
+  echo -e "-----------------\n"
+
+echo -e "I: Checking if votes tally......\n"
+
+if [ "$next" -eq "$new" ]; then
   echo -e "\\e[42m------------"
   echo -e "\\e[92mTests passed"
   echo -e "\\e[42m------------"

result/Jenkinsfile

@@ -0,0 +1,77 @@
+pipeline {
+
+   agent none
+
+   triggers { pollSCM('H/2 * * * *') }
+
+    stages {
+        stage('Build') {
+            when {
+                 changeset "**/result/**"
+            }
+            agent {
+              docker {
+                image 'node:8.9-alpine'
+              }
+            }
+            steps {
+                echo 'Building..'
+                dir('result'){
+                  sh 'npm install'
+                }
+            }
+        }
+
+        stage('Test') {
+            when {
+                 changeset "**/result/**"
+            }
+            agent {
+              docker {
+                image 'node:8.9-alpine'
+              }
+            }
+            steps { 
+                echo 'Testing..'
+                dir('result'){
+                  sh 'npm install'
+                  sh 'npm test'
+                }
+            }
+        }
+
+        stage('Sonarqube') {
+            when {
+                 changeset "**/result/**"
+                 branch 'master'
+            }
+            agent any 
+            environment{
+              sonarpath = tool 'SonarScanner'
+            }
+            steps {
+                echo 'Running Sonarqube Analysis..'
+                  withSonarQubeEnv('sonar') {
+                    sh "${sonarpath}/bin/sonar-scanner -Dproject.settings=result/sonar-project.properties"
+                  }
+            }
+        }
+
+        stage('Package with Docker') {
+            when {
+                 changeset "**/result/**"
+            }
+            agent any
+            steps {
+                echo 'Building and Publishing Docker Image'
+                script {
+                  docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') {
+                    def customImage = docker.build("initcron/result:${env.BRANCH_NAME}-v${env.BUILD_ID}", "./result")
+                    customImage.push("${env.BRANCH_NAME}")
+                    customImage.push()
+                  }
+                }
+            }
+        }
+    }
+}

result/package.json

@@ -1,10 +1,10 @@
 {
   "name": "result",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "",
   "main": "server.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "node_modules/.bin/mocha"
   },
   "author": "",
   "license": "MIT",
@@ -16,5 +16,9 @@
     "async": "^1.5.0",
     "pg": "^4.4.3",
     "socket.io": "^1.3.7"
+  },
+  "devDependencies": {
+    "chai": "^4.0.2",
+    "mocha": "^3.4.2"
   }
 }

result/test/mock.test.js

@@ -0,0 +1,29 @@
+const expect = require('chai').expect;
+
+describe('mock test 1', () => {
+  it('unit test 1', () => {
+    expect(true).to.be.true;
+  });
+}); 
+
+
+describe('mock test 2', () => {
+  it('unit test 2', () => {
+    expect(true).to.be.true;
+  });
+});
+
+describe('mock test 3', () => {
+  it('unit test 3', () => {
+    expect(true).to.be.true;
+  });
+});
+
+
+describe('mock test 4', () => {
+  it('unit test 4', () => {
+    expect(true).to.be.true;
+  });
+});
+
+

vote/Jenkinsfile

@@ -0,0 +1,80 @@
+pipeline {
+
+   agent none
+
+   triggers { pollSCM('H/2 * * * *') }
+
+    stages {
+
+        stage('Build') {
+            when {
+                 changeset "**/vote/**"
+            }
+            agent {
+              docker {
+                image 'python:2.7-alpine'
+                args '--user root'
+              }
+            }
+            steps {
+                echo 'Building..'
+                dir('vote'){
+                  sh 'pip install -r requirements.txt'
+                }
+            }
+        }
+
+        stage('Test') {
+            when {
+                 changeset "**/vote/**"
+            }
+            agent {
+              docker {
+                image 'python:2.7-alpine'
+                args '--user root'
+              }
+            }
+            steps { 
+                echo 'Testing..'
+                dir('vote'){
+                  sh 'pip install -r requirements.txt'
+                  sh 'nosetests -v'
+                }
+            }
+        }
+
+        stage('Sonarqube') {
+            when {
+                 changeset "**/vote/**"
+                 branch 'master'
+            }
+            agent any
+            environment{
+              sonarpath = tool 'SonarScanner'
+            }
+            steps {
+                echo 'Running Sonarqube Analysis..'
+                  withSonarQubeEnv('sonar') {
+                    sh "${sonarpath}/bin/sonar-scanner -Dproject.settings=vote/sonar-project.properties"
+                  }
+            }
+        }
+
+        stage('Package with Docker') {
+            when {
+                 changeset "**/vote/**"
+            }
+            agent any
+            steps {
+                echo 'Building and Publishing Docker Image'
+                script {
+                  docker.withRegistry('https://index.docker.io/v1/', 'dockerhub') {
+                    def customImage = docker.build("initcron/vote:${env.BRANCH_NAME}-v${env.BUILD_ID}", "./vote")
+                    customImage.push("${env.BRANCH_NAME}")
+                    customImage.push()
+                  }
+                }
+            }
+        }
+    }
+}

vote/integration/Dockerfile

@@ -0,0 +1,5 @@
+FROM alpine:3.9.4
+WORKDIR /test
+COPY . .
+RUN apk add curl
+CMD sh

vote/integration/docker-compose.yaml

@@ -0,0 +1,26 @@
+version: "3"
+
+services:
+
+  integration:
+    build: ./
+    networks:
+      - integration
+
+  vote:
+    build: ../
+    ports: ["80"]
+    depends_on:
+      - redis
+    networks:
+      - integration
+
+  redis:
+    image: redis:alpine
+    ports: ["6379"]
+    networks:
+      - integration
+
+networks:
+  integration:
+

vote/integration/test.sh

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+echo "I: Checking if frontend vote app is available..."
+
+curl  http://vote > /dev/null 2>&1
+
+if [ $? -eq 0 ]
+then
+  echo "---------------------------------------"
+  echo "Vote app is available....proceeding"
+  echo "---------------------------------------"
+else
+  echo "---------------------------------------"
+  echo "Vote app is not avilable....aborting"
+  echo "---------------------------------------"
+  exit 2
+fi
+
+
+echo "I: Launching integration test..."
+
+# submit a vote. Will return an error if it fails to submit or store vote in redis
+# Fail integration test if  it returns exit code 0 (error state)
+
+curl -sS -X POST --data "vote=b" http://vote | grep -i erro
+
+if [ $? -eq 0 ]
+then
+  # error, failed
+  exit 1
+else
+  # passed 
+  exit 0
+fi
+
+