Merge pull request #3 from ruzickap/feature/travis_fix
TravisCI fixes
diff --git "a/\173\173cookiecutter.service_name\175\175/.travis.yml" "b/\173\173cookiecutter.service_name\175\175/.travis.yml"
index bd09d8d..2ed4aa8 100644
--- "a/\173\173cookiecutter.service_name\175\175/.travis.yml"
+++ "b/\173\173cookiecutter.service_name\175\175/.travis.yml"
@@ -8,10 +8,8 @@
- apt-transport-https
install:
- - git fetch --unshallow --tags
- pip install PyYAML
- pip install virtualenv
- - pip install reno
- |
test -e Gemfile || cat <<EOF > Gemfile
source 'https://rubygems.org'
diff --git "a/\173\173cookiecutter.service_name\175\175/tests/pip_requirements.txt" "b/\173\173cookiecutter.service_name\175\175/tests/pip_requirements.txt"
new file mode 100644
index 0000000..8fad73f
--- /dev/null
+++ "b/\173\173cookiecutter.service_name\175\175/tests/pip_requirements.txt"
@@ -0,0 +1 @@
++jsonschema
diff --git "a/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh" "b/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh"
index 9993b8d..5d43e2e 100755
--- "a/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh"
+++ "b/\173\173cookiecutter.service_name\175\175/tests/run_tests.sh"
@@ -195,7 +195,7 @@
real_run() {
for pillar in ${PILLARDIR}/*.sls; do
state_name=$(basename ${pillar%.sls})
- salt_run --id=${state_name} state.sls ${FORMULA_NAME} || { log_err "Execution of ${FORMULA_NAME}.${state_name} failed"; exit 1; }
+ salt_run -m ${DEPSDIR}/salt-formula-salt --id=${state_name} state.sls ${FORMULA_NAME} || { log_err "Execution of ${FORMULA_NAME}.${state_name} failed"; exit 1; }
done
}