From 832e6d26ed320ddf6841b4977c9e801883b71988 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <wagmarcel@web.de>
Date: Sat, 6 Apr 2019 11:39:06 +0200
Subject: [PATCH] Build and E2E Test implemented for CircleCi environment

Signed-off-by: Marcel Wagner <wagmarcel@web.de>
---
 .circleci/config.yml | 161 ++++++++++++++++++++++++++++++++++++-------
 Makefile             |   2 +-
 2 files changed, 139 insertions(+), 24 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f6a399b5..4d118823 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,28 +2,92 @@
 #
 # Check https://circleci.com/docs/2.0/language-javascript/ for more details
 #
-version: 2
-jobs:
-  build:
-    docker:
-      # specify the version you desire here
-      - image: circleci/node:8.0
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/mongo:3.4.4
-
+version: 2.1
+executors:
+  my-executor:
+    machine:
+      enabled: true
+      image: ubuntu-1604:201903-01
     working_directory: ~/repo
     environment:
       shell: /bin/bash
       TERM: xterm
-
+      TZ: "Europe/Berlin"
+commands:
+  setup-build-environment:
+    description: "Setup build Environment"
+    steps:
+      - run:
+          shell: /bin/bash
+          name: Setup build environment
+          command: |
+            cd platform-setup
+            sudo ./setup-ubuntu16.04.sh
+  setup-branch:
+    description: "Setup branch"
+    steps:
+      - run:
+          shell: /bin/bash
+          name: Setup branch
+          command: |
+            sudo apt install jq
+            # First find out Base Branch (if any)
+            if [ ! -z "${CIRCLE_PULL_REQUEST}" ]; then
+              PR=${CIRCLE_PR_NUMBER}
+              PR_REPO=${CIRCLE_PR_REPONAME}
+              PROJECT_USERNAME=${CIRCLE_PROJECT_USERNAME}
+              url="https://api.github.com/repos/${PROJECT_USERNAME}/${PR_REPO}/pulls/${PR}"
+              BASE_BRANCH=$(curl "$url" | jq '.base.ref' | tr -d '"')
+              echo Detected Pull Request with Base Branch ${BASE_BRANCH}
+            fi
+            git submodule init
+            git submodule update
+            if [ "$CIRCLE_BRANCH" = "develop" ] || [ "${BASE_BRANCH}" = "develop" ]; then
+              #If on develop or a PR towards develop assume that all submodules are updated
+              make update
+            fi
+  build-branch:
+    description: "Build branch"
+    steps:
+      - run:
+          shell: /bin/bash
+          name: Build branch
+          command: |
+            yes| make build
+  e2e-test:
+    description: "E2E test"
+    steps:
+      - run:
+          shell: /bin/bash
+          name: E2e Test
+          command: |
+            yes| make test
+  push-images:
+    description: "Push images"
+    parameters:
+      tag:
+        type: string
+        default: "latest"
+    steps:
+      - run:
+          shell: /bin/bash
+          name: Push images to docker hub
+          command: |
+            docker login  -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
+            DOCKER_TAG="latest"
+            if [ "<< parameters.tag >>" = "date" ]; then
+              DOCKER_TAG=`date -I`
+            fi
+            if [ "<< parameters.tag >>" = "tag" ]; then
+              DOCKER_TAG=`git describe --tag` || exit 1
+            fi
+            echo Now trying to push with Tag ${DOCKER_TAG}
+            make push
+  check-signed:
+    description: "Check whether latest commit is signed"
     steps:
-      - checkout
-
       - run:
-          name: Check whether most recent commit is signedoff
+          name: Check whether most recent commit is signed
           shell: /bin/bash
           command: |
             MESSAGE=`git log -1 --pretty=%B`
@@ -34,10 +98,61 @@ jobs:
               echo "Commit is not signedoff"
               exit 1
             fi
-
-      # run tests!
-      - run:
-          shell: /bin/bash
-          name: Run remote build & e2e tests
-          command: |
-            ssh -o "StrictHostKeyChecking no" root@ci.streammyiot.com /opt/test/testTest.sh test
+jobs:
+  build:
+    executor: my-executor
+    steps:
+      - checkout
+      - check-signed
+      - setup-build-environment
+      - setup-branch
+      - build-branch
+      - e2e-test
+  build-master:
+    executor: my-executor
+    steps:
+      - checkout
+      - setup-build-environment
+      - setup-branch
+      - build-branch
+      - e2e-test
+      - push-images:
+          tag: "tag"
+  build-nightly:
+    executor: my-executor
+    steps:
+      - checkout
+      - setup-build-environment
+      - setup-branch
+      - build-branch
+      - e2e-test
+      - push-images:
+          tag: "date"
+workflows:
+  version: 2.1
+  workflow:
+    jobs:
+      - build:
+          filters:
+            branches:
+              ignore:
+                - master
+      - build-master:
+          filters:
+            branches:
+              only:
+                - master
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - develop
+    jobs:
+      - build-nightly:
+          filters:
+            branches:
+              only:
+                - develop
diff --git a/Makefile b/Makefile
index 9fa21c1a..ebccb187 100644
--- a/Makefile
+++ b/Makefile
@@ -194,7 +194,7 @@ stop:
 ##
 update: distclean
 	@$(call msg,"Git Update (dev only)");
-	@git pull
+	#@git pull
 	@if [ -f setup-environment.sh ]; then \
 		mv setup-environment.sh config-backup/setup-environment-$$(date +%Y-%m-%d-%H%M%S).sh.bak; \
 	fi;