remove old command from .travis.yaml

topfreegames · May 18, 2018 · be4a6a5 · be4a6a5
1 parent 4bde3ea
commit be4a6a5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,12 +11,8 @@ services:
 install:
   - make setup-ci
 
-before_script:
-  - make run-containers
-  - make create-es-index-template
-
 script:
-  - make coverage
+  - make test
   - $HOME/gopath/bin/goveralls -coverprofile coverage-all.out -service=travis-ci
 
 after_success:

diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ create-cassandra-table:
 	@echo 'Done'
 
 run-tests: run-containers
-	@make CASSANDRA_CONTAINER=test_containers_cassandra_1 create-cassandra-table
+	@make CASSANDRA_CONTAINER=mqtthistory_test_cassandra create-cassandra-table
 	@make coverage
 	@make kill-containers
 

diff --git a/test_containers/docker-compose.yml b/test_containers/docker-compose.yml
@@ -3,16 +3,19 @@ version: '2'
 services:
   cassandra:
     image: cassandra:3.11
+    container_name: mqtthistory_test_cassandra
     ports:
       - 9042:9042
   mosquitto:
     image: eclipse-mosquitto:1.4.12
+    container_name: mqtthistory_test_mosquitto
     ports:
       - "1883:1883"
     environment:
       - DOMAIN=example.local
       - PORT=8080
   mongo:
+    container_name: mqtthistory_test_mongo
     image: mongo:3.0.15-wheezy
     ports:
       - "27017:27017"