Update local with master changes

Author: ngehani

1_deploy.sh

@@ -8,4 +8,8 @@ else
   export VOTE_TAG=$1
 fi;
 
+docker-compose -f docker-compose-voteinfra.yml up -d
+
+source ./set_network.sh
+
 docker-compose -f docker-compose-voteapp.yml up -d

2_deploy_tugbot.sh

@@ -2,4 +2,6 @@
 
 echo "Deploying Tugbot Testing Framework ..."
 
+source ./set_network.sh
+
 docker-compose -f docker-compose-tugbot.yml up -d

3_configure_kibana.sh

@@ -2,4 +2,6 @@
 
 echo "Running Functional and Integration Tests ..."
 
+source ./set_network.sh
+
 docker-compose -f docker-compose-tests.yml up -d

4_run_tests.sh

@@ -1,3 +1,24 @@
 #!/bin/bash
 
-for i in {1..10}; do ./1_deploy.sh bad; sleep 15; ./1_deploy.sh; done
+if [ -z "$1" ]; then
+  END=10
+else
+  END=$1
+fi 
+
+if [ -z "$2" ]; then
+  SLEEP=15
+else
+  SLEEP=$2
+fi
+
+for i in $(seq 1 ${END}); do 
+  echo "***** ITERATION ${i}/${END} ******"
+  echo " > Deploy BUG "
+  (./1_deploy.sh bad)
+  sleep "${SLEEP}"
+  echo " > Fix BUG "
+  (./1_deploy.sh)
+  sleep "${SLEEP}"
+  echo " "
+done

5_bug_on_off.sh

@@ -2,4 +2,6 @@
 
 echo "Running Pumba Network Emulation ..."
 
+source ./set_network.sh
+
 docker-compose -f docker-compose-pumba.yml up

7_run_pumba.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 docker-compose -f docker-compose-voteapp.yml down --remove-orphans 
+docker-compose -f docker-compose-voteinfra.yml down --remove-orphans 
 
 # cleanup volumes
 if ([ $1 ] && [ $1 = "all" ]); then

9_clean.sh

@@ -3,6 +3,10 @@ services:
 
   pumba:
     image: gaiaadm/pumba:master
+    environment:
+      http_proxy: "$tb_proxy"
+      https_proxy: "$tb_proxy"
+      no_proxy: "$tb_no_proxy"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     networks:

docker-compose-pumba.yml

@@ -3,13 +3,16 @@ services:
 
   votests:
     image: gaiadocker/example-voting-app-tests:latest
+    environment:
+      http_proxy: "$tb_proxy"
+      https_proxy: "$tb_proxy"
+      no_proxy: "$tb_no_proxy"
+      dbHost: "db"
+      appHost: "voting-app:80"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
       - voteapp
-    environment:
-      - dbHost=db
-      - appHost=voting-app:80
 
 networks:
     voteapp:

docker-compose-tests.yml

@@ -10,6 +10,10 @@ services:
 
   collect:
     image: gaiadocker/tugbot-collect:latest
+    environment:
+      http_proxy: "$tb_proxy" 
+      https_proxy: "$tb_proxy"
+      no_proxy: "$tb_no_proxy"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
@@ -20,6 +24,10 @@ services:
 
   result:
     image: gaiadocker/tugbot-result-service-es:latest
+    environment:
+      http_proxy: "$tb_proxy"
+      https_proxy: "$tb_proxy"
+      no_proxy: "$tb_no_proxy"
     ports:
       - "8081:8081"
     networks:
@@ -38,12 +46,15 @@ services:
 
   kibana:
     image: kibana:4.5.1
+    environment:
+      http_proxy: "$tb_proxy"
+      https_proxy: "$tb_proxy"
+      no_proxy: "$tb_no_proxy"
+      ELASTICSEARCH_URL: "http://es:9200"
     ports:
       - "5601:5601"
     networks:
       - voteapp
-    environment:
-      - ELASTICSEARCH_URL=http://es:9200
 
 volumes:
   es:

docker-compose-tugbot.yml

@@ -4,46 +4,36 @@ services:
 
   voting-app:
     image: gaiadocker/example-voting-app-vote:${VOTE_TAG}
+    environment:
+      http_proxy: "$tb_proxy"
+      https_proxy: "$tb_proxy"
+      no_proxy: "$tb_no_proxy"
     ports:
       - 5000:80
     networks:
       - voteapp
 
   result-app:
     image: gaiadocker/example-voting-app-result:latest
+    environment:
+      http_proxy: "$tb_proxy"
+      https_proxy: "$tb_proxy"
+      no_proxy: "$tb_no_proxy"
     ports:
       - 5001:80
     networks:
       - voteapp
 
   worker:
     image: gaiadocker/example-voting-app-worker:latest
+    environment:
+      http_proxy: "$tb_proxy"
+      https_proxy: "$tb_proxy"
+      no_proxy: "$tb_no_proxy"
     networks:
       voteapp:
         aliases:
           - workers
 
-  redis:
-    image: redis:3.2-alpine
-    ports:
-      - "6379"
-    networks:
-      - voteapp
-    container_name: redis
-
-  db:
-    image: postgres:9.4
-    volumes:
-      - db-data:/var/lib/postgresql/data
-    networks:
-      - voteapp
-    container_name: db
-
-volumes:
-  db-data:
-    # driver: rexray
-    # driver_opts:
-    #  size: 10
-
 networks:
     voteapp:

docker-compose-voteapp.yml

@@ -0,0 +1,29 @@
+version: "2"
+
+services:
+
+  redis:
+    image: redis:3.2-alpine
+    ports:
+      - "6379"
+    networks:
+      - voteapp
+    container_name: redis
+
+  db:
+    image: postgres:9.4
+    volumes:
+      - db-data:/var/lib/postgresql/data
+    networks:
+      - voteapp
+    container_name: db
+
+volumes:
+  db-data:
+    # driver: rexray
+    # driver_opts:
+    #  size: 10
+
+networks:
+    voteapp:
+

docker-compose-voteinfra.yml

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+subnet=$(docker network inspect --format='{{(index (index .IPAM.Config) 0).Subnet}}' examplevotingapp_voteapp)
+
+[ $http_proxy ] && tb_proxy=$http_proxy || tb_proxy=$HTTP_PROXY
+tb_no_proxy=$(echo redis,db,voting-app,result,es),$(seq -s ',' -f $(echo $subnet | cut -d '.' -f1-3).%g 0 255)
+[ $no_proxy ] && tb_no_proxy=$tb_no_proxy,$no_proxy,127.0.0.1,localhost || tb_no_proxy=$tb_no_proxy,$NO_PROXY,127.0.0.1,localhost
+
+# echo tb_proxy=$tb_proxy
+# echo tb_no_proxy=$tb_no_proxy
+export tb_proxy=$tb_proxy
+export tb_no_proxy=$tb_no_proxy,result
+