Skip to content

Commit

Permalink
sparkly-testing on python3 (#51)
Browse files Browse the repository at this point in the history
`argparse` is slightly different on python2 and python3.
  • Loading branch information
drudim committed Aug 3, 2017
1 parent b5552f6 commit 3d2bdfa
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
- docker

env:
DOCKER_COMPOSE_VERSION: 1.8.1
DOCKER_COMPOSE_VERSION: 1.15.0

before_install:
- sudo rm /usr/local/bin/docker-compose
Expand Down
6 changes: 5 additions & 1 deletion bin/sparkly-testing
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,8 @@ if __name__ == '__main__':
).set_defaults(func=lambda _: InstantTesting.deactivate() or InstantTesting.activate())

args = parser.parse_args()
args.func(args)

if hasattr(args, 'func'):
args.func(args)
else:
parser.print_help()
47 changes: 33 additions & 14 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,33 @@
# limitations under the License.
#

version: '2'
version: '2.1'
services:
dev:
build: .
depends_on:
cassandra.docker:
condition: service_healthy
elastic.docker:
condition: service_healthy
kafka.docker:
condition: service_healthy
mysql.docker:
condition: service_healthy
volumes:
- .:/opt/sparkly/
depends_on:
- cassandra.docker
- elastic.docker
- mysql.docker
- kafka.docker

test:
build: .
depends_on:
- cassandra.docker
- elastic.docker
- mysql.docker
- kafka.docker
cassandra.docker:
condition: service_healthy
elastic.docker:
condition: service_healthy
kafka.docker:
condition: service_healthy
mysql.docker:
condition: service_healthy

cassandra.docker:
image: cassandra:2.1.13
Expand All @@ -41,19 +49,28 @@ services:
environment:
MAX_HEAP_SIZE: 500M
HEAP_NEWSIZE: 200M
healthcheck:
test: ps ax | grep cassandra

elastic.docker:
image: elasticsearch:1.7.0
healthcheck:
test: ps ax | grep elastic

mysql.docker:
image: mysql
environment:
MYSQL_DATABASE: sparkly_test
MYSQL_USER: root
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
healthcheck:
test: ps ax | grep mysql

kafka.docker:
image: wurstmeister/kafka
image: confluent/kafka
depends_on:
zookeeper.docker:
condition: service_healthy
expose:
- "9092"
environment:
Expand All @@ -62,10 +79,12 @@ services:
KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
KAFKA_ZOOKEEPER_CONNECT: zookeeper.docker:2181
KAFKA_NUM_PARTITIONS: 3
depends_on:
- zookeeper.docker
healthcheck:
test: ps ax | grep kafka

zookeeper.docker:
image: wurstmeister/zookeeper
image: confluent/zookeeper
expose:
- "2181"
healthcheck:
test: ps ax | grep zookeeper

0 comments on commit 3d2bdfa

Please sign in to comment.