From 2ed3baaa7a37ae053b9b812a24259830e76aa5ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Sat, 20 Jun 2020 00:03:07 +0200
Subject: [PATCH] Run sims via Docker

---
 .travis.yml                            | 27 ++++++++++++++------------
 docker/edge/docker-compose.edge.yml    |  5 ++---
 docker/edge/docker-compose.modules.yml | 19 +++++++-----------
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 268a32c..b3436ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,21 +5,23 @@ services:
  - docker
 
 before_install:
-  - pip -q install -U docker-compose -r requirements.txt
+  - pip -q install -U docker-compose
 
 jobs:
   include:
   - stage: build
-    # before_script:
-    #   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+    before_script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
     script:
       - docker-compose -f docker/docker-compose.yml build
-    #  - docker push daniviga/beer
-    #  - docker push daniviga/ntpd
+      - docker push daniviga/beer
+      - docker push daniviga/ntpd
+    on:
+      branch: master
   - stage: django
     install:
+      - docker-compose -f docker/docker-compose.yml pull
       - docker-compose -f docker/docker-compose.yml build
-    #  - docker-compose -f docker/docker-compose.yml pull
     before_script:
       - docker-compose -f docker/docker-compose.yml up -d
     script:
@@ -29,12 +31,13 @@ jobs:
       - IOT_TL=http
       - IOT_TL=mqtt
     install:
+      - docker-compose -f docker/docker-compose.yml pull
       - docker-compose -f docker/docker-compose.yml build
-    #  - docker-compose -f docker/docker-compose.yml pull
     before_script:
-      - docker-compose -f docker/docker-compose.yml up -d
+      - docker-compose -f docker/docker-compose.yml -f docker/edge/docker-compose.edge.yml up -d
     script:
-      - sleep 10
-      - IOT_DEBUG=1 ./docker/simulator/device_simulator.py -s 'simu1234' -d 5 &
-      - sleep 15
-      - curl -sf http://localhost/telemetry/simu1234/last/
+      - sleep 5  # warm-up
+      - sed -i 's/# IOT_SERIAL/IOT_SERIAL/g' docker/edge/docker-compose.modules.yml
+      - DOCKER_HOST='127.0.0.1:22375' docker-compose -f docker/edge/docker-compose.modules.yml up -d
+      - sleep 30  # collect some telemetry
+      - curl -sf http://localhost/telemetry/${IOT_TL}1234/last/
diff --git a/docker/edge/docker-compose.edge.yml b/docker/edge/docker-compose.edge.yml
index 7c028c3..f82d6a1 100644
--- a/docker/edge/docker-compose.edge.yml
+++ b/docker/edge/docker-compose.edge.yml
@@ -2,12 +2,11 @@ version: "3.7"
 
 services:
   edge-host:
-    <<: *service_default
     image: docker:dind
     privileged: true
     environment:
       DOCKER_TLS_CERTDIR:
-    # networks:
-    #   - net
+    networks:
+      - net
     ports:
       - "127.0.0.1:22375:2375"
diff --git a/docker/edge/docker-compose.modules.yml b/docker/edge/docker-compose.modules.yml
index 0d4cfab..7157150 100644
--- a/docker/edge/docker-compose.modules.yml
+++ b/docker/edge/docker-compose.modules.yml
@@ -1,8 +1,5 @@
 version: "3.7"
 
-networks:
-  localnet:
-
 x-op-service-default: &service_default
   restart: always
   init: true
@@ -15,12 +12,11 @@ services:
       context: ../simulator
     image: daniviga/bite-device-simulator
     environment:
-      IOT_HTTP: "http://192.168.10.123:8000"
-      # IOT_SERIAL: "abcd1234"
+      IOT_HTTP: "http://ingress"
+      # IOT_SERIAL: "http1234"
       # IOT_DELAY: 10
       IOT_DEBUG: 1
-    networks:
-      - localnet
+    network_mode: "host"
 
   device-mqtt:
     <<: *service_default
@@ -28,11 +24,10 @@ services:
       context: ../simulator
     image: daniviga/bite-device-simulator
     environment:
-      IOT_HTTP: "http://192.168.10.123:8000"
-      IOT_MQTT: "192.168.10.123:1883"
-      # IOT_SERIAL: "abcd1234"
+      IOT_HTTP: "http://ingress"
+      IOT_MQTT: "broker:1883"
+      # IOT_SERIAL: "mqtt1234"
       # IOT_DELAY: 10
       IOT_DEBUG: 1
     command: ["/opt/bite/device_simulator.py", "-t", "mqtt"]
-    networks:
-      - localnet
+    network_mode: "host"