Develop2

.circleci/config.yml

@@ -0,0 +1,172 @@
+# Javascript Node CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-javascript/ for more details
+#
+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 PR number (CircleCI is not that sophisticated about it)
+
+            if [ ! -z "${CIRCLE_PULL_REQUEST}" ]; then
+              #echo Pull request active ${CIRCLE_PULL_REQUEST}
+              PR=${CIRCLE_PR_NUMBER}
+              PR_REPO=${CIRCLE_PR_REPONAME}
+              PR_USERNAME=${CIRCLE_PR_USERNAME}
+              if [ -z "${PR}"]; then
+                #no forked PR
+                PR=$(basename ${CIRCLE_PULL_REQUEST})
+                PR_REPO=${CIRCLE_PROJECT_REPONAME}
+                PR_USERNAME=${CIRCLE_PROJECT_USERNAME}
+              fi
+              #echo Marcel922 ${PR_REPO} + ${PR}
+              #echo Marcel352 ${PR_USERNAME}
+              url="https://api.github.com/repos/${PR_USERNAME}/${PR_REPO}/pulls/${PR}"
+              BASE_BRANCH=$(curl "$url" | jq '.base.ref' | tr -d '"')
+              #echo Marcel643 $url
+              #echo $(curl "$url")
+              echo Marcel822 ${BASE_BRANCH}
+            fi
+            if [ ! "$CIRCLE_BRANCH" = "master" ]; then
+              git branch --set-upstream-to=origin/${CIRCLE_BRANCH} ${CIRCLE_BRANCH}
+              git submodule init
+              git submodule update
+            fi
+            if [ "$CIRCLE_BRANCH" = "develop" ] || [ "${BASE_BRANCH}" = "develop" ]; then
+              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:
+      - run:
+          name: Check whether most recent commit is signed
+          shell: /bin/bash
+          command: |
+            MESSAGE=`git log -1 --pretty=%B`
+            echo "Checking whether signed"
+            if [[ "${MESSAGE}" == *Signed-off-by:*@* ]]; then
+              echo "Commit is signedoff"
+            else
+              echo "Commit is not signedoff"
+              exit 1
+            fi
+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

.gitignore

@@ -1,4 +1,10 @@
 setup-environment.sh
 .init
 .prepare
-data
+data
+config-backup/
+.firstRun
+tests/.env
+tests/package-lock.json
+tests/test-config.json
+data-backup/

.gitmodules

@@ -9,4 +9,7 @@
 	url = https://github.com/Open-IoT-Service-Platform/oisp-gearpump-rule-engine.git
 [submodule "oisp-websocket-server"]
 	path = oisp-websocket-server
-	url = https://github.com/Open-IoT-Service-Platform/oisp-websocket-server.git
+	url = https://github.com/Open-IoT-Service-Platform/oisp-websocket-server.git
+[submodule "oisp-mqtt-gw"]
+	path = oisp-mqtt-gw
+	url = https://github.com/Open-IoT-Service-Platform/oisp-mqtt-gw.git