From 5259e9cc9191ca851ff63583930ed29ec88a65a2 Mon Sep 17 00:00:00 2001
From: etienne-napoleone <etienne@tomochain.com>
Date: Mon, 25 Jun 2018 10:51:47 +0700
Subject: [PATCH] Update .travis.yml and cleanup

---
 .travis.yml             | 21 ++++++++++++++++-----
 docker-compose.test.yml | 11 -----------
 docker/docker_tests.sh  |  3 ---
 docker_push.sh          |  2 +-
 docker_rebuild.sh       |  1 +
 5 files changed, 18 insertions(+), 20 deletions(-)
 delete mode 100644 docker-compose.test.yml
 delete mode 100644 docker/docker_tests.sh
 create mode 100644 docker_rebuild.sh

diff --git a/.travis.yml b/.travis.yml
index fafb91df50..64d0f4126b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,7 @@ sudo: required
 language: go
 go_import_path: github.com/ethereum/go-ethereum
 
-services:
-  - docker
+services: true
 
 before_install: true
 
@@ -31,6 +30,14 @@ jobs:
     - sudo chown root:$USER /etc/fuse.conf
     - go run build/ci.go install
     - go run build/ci.go test -coverage
+  - os: osx
+    go: '1.10'
+    script:
+    - unset -f cd
+    - brew update
+    - brew cask install osxfuse
+    - go run build/ci.go install
+    - go run build/ci.go test -coverage
   - stage: Lint
     os: linux
     dist: trusty
@@ -42,11 +49,15 @@ jobs:
     script:
     - go run build/ci.go lint
   - stage: Push Docker image
+    services:
+      - docker
     before_install:
-      - docker build -t enapoleone/tomochain .
-      - docker run enapoleone/tomochain
+      - docker build -t etiennenapoleone/tomochain .
+      - docker run etiennenapoleone/tomochain
     deploy:
       provider: script
-      script: bash docker_push
+      script: bash docker_push.sh
       on:
         branch: travis
+  - stage: Trigger rebuild of infrastructure image
+    script: bash docker_rebuild.sh
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
deleted file mode 100644
index 987c266fd0..0000000000
--- a/docker-compose.test.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: "3.4"
-
-services:
-
-  sut:
-    build: .
-    volumes:
-      - "./docker/docker_tests.sh:/test/docker_tests.sh"
-    entrypoint:
-      - /bin/sh
-      - /test/docker_tests.sh
diff --git a/docker/docker_tests.sh b/docker/docker_tests.sh
deleted file mode 100644
index 8f88919e2d..0000000000
--- a/docker/docker_tests.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-$(tomo --help | grep -q tomo)
diff --git a/docker_push.sh b/docker_push.sh
index 6fda4bad46..06a33742d6 100644
--- a/docker_push.sh
+++ b/docker_push.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
 docker push etiennenapoleone/tomochain:latest
 docker push etiennenapoleone/tomochain:$(git log --pretty=format:'%h' -n 1 | cat)
diff --git a/docker_rebuild.sh b/docker_rebuild.sh
new file mode 100644
index 0000000000..a068c88f98
--- /dev/null
+++ b/docker_rebuild.sh
@@ -0,0 +1 @@
+curl -X POST $INFRA_IMAGE