Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
sudo: false
sudo: required
services:
- docker
language: python
python:
- "2.7"
env:
- TOX_ENV=flake8
- TOX_ENV=py27
- TOX_ENV=py26
matrix:
include:
- python: 2.6
env: TOXENV=py26
- python: 2.7
env: TOXENV=py27
- python: 3.5
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36
- python: 3.6
env: TOXENV=flake8

install:
- pip install tox
script:
- tox -e $TOX_ENV

- tox -e $TOXENV
83 changes: 0 additions & 83 deletions tests/resources/packerfile.json

This file was deleted.

8 changes: 4 additions & 4 deletions tests/resources/simple-test.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"builders": [
{
"type": "null",
"ssh_host": "127.0.0.1",
"ssh_username": "root",
"ssh_password": "password"
"type": "docker",
"image": "alpine",
"discard": true,
"run_command": ["-d", "-i", "-t", "{{.Image}}", "/bin/sh"]
}
]
}
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# content of: tox.ini , put in same dir as setup.py
[tox]
envlist=flake8,py27,py26,py35
envlist=flake8,py27,py26,py35,py36

[testenv]
deps =
Expand Down