diff --git a/.travis.yml b/.travis.yml index bf18d485b..07210a3f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ -language: python -python: "2.7" -sudo: required +language: java +jdk: + - oraclejdk8 services: - docker @@ -15,13 +15,10 @@ addons: - oracle-java8-set-default install: - - pip install ansible docker-py boto boto3 troposphere - - printf '[defaults]\nroles_path=../' >ansible.cfg - - ansible-galaxy install -p ../ -r deploy/requirements.yml + - ./deploy/install_wimpy.sh - echo $VAULT_PASSWORD > /tmp/vault script: - - ./mvnw package - ansible-playbook deploy/deploy.yml -vvvv --vault-password-file=/tmp/vault --extra-vars "wimpy_release_version=${TRAVIS_COMMIT} wimpy_deployment_environment=develop" env: global: diff --git a/deploy/deploy.yml b/deploy/deploy.yml index 897920baf..b7c9de7df 100644 --- a/deploy/deploy.yml +++ b/deploy/deploy.yml @@ -1,6 +1,7 @@ --- - hosts: localhost + connection: local vars_files: - "{{ playbook_dir }}/{{ wimpy_deployment_environment }}.yml" vars: @@ -13,5 +14,5 @@ wimpy_aws_elb_healthcheck_ping_protocol: "http" wimpy_aws_elb_healthcheck_ping_path: "/" roles: -# - role: wimpy.build - - role: fiunchinho.wimpy + - role: wimpy.build + - role: wimpy.deploy diff --git a/deploy/install_wimpy.sh b/deploy/install_wimpy.sh new file mode 100755 index 000000000..7112fcb71 --- /dev/null +++ b/deploy/install_wimpy.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -eu + +virtualenv . +source "bin/activate" +pip install -r requirements.txt +printf '[defaults]\nroles_path=../' >ansible.cfg +ansible-galaxy install -p ../ -r deploy/requirements.yml diff --git a/deploy/requirements.txt b/deploy/requirements.txt new file mode 100644 index 000000000..b1e1460b3 --- /dev/null +++ b/deploy/requirements.txt @@ -0,0 +1,5 @@ +ansible==2.2.1 +docker-py==1.8.1 +boto==2.39.0 +boto3==1.4.0 +troposphere==1.9.2