summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2015-11-24 10:35:18 -0800
committerJohn Keiser <john@johnkeiser.com>2015-11-24 10:35:18 -0800
commit54dc8d4ebde11e14f5142a56a2653172597c3956 (patch)
tree12fac70bdf484c773437160d136db9c92819c3bb
parentd6d79849e766669dff300cd39591ef2bffc2f225 (diff)
parent67885e337029933836ca21d93cc80c1eb55c3a6f (diff)
downloadchef-54dc8d4ebde11e14f5142a56a2653172597c3956.tar.gz
Merge branch 'jk/proxy-tests'
-rw-r--r--.travis.yml18
1 files changed, 18 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 44317aaeff..3a37c6dbc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -121,6 +121,24 @@ matrix:
- secure: SOMYGVfHLkHsH6koxpw68YQ4ydEo6YXPhHbrYGQbehUbFa6+OZzBcAJRJbKjyhD2AZRvNr2jB8XnjYKvVyDGQRpkWhGYZ7CpHqINpDsqKBsbiMe3/+KmKQqS+UKxNGefquoOvyQ1N8Xy77dkWYokRtGMEuR12RkZLonxiDW8Qyg=
- secure: bSsDg+dJnPFdFiC/tbb61HdLh/Q0z2RVVAReT1wvV1BN4fN4NydvkUGbQmyFNyyunLulEs+X0oFma9L0497nUlTnan8UOg9sIleTSybPX6E9xSKKCItH1GgDw8bM9Igez5OOrrePBD3altVrH+FmGx0dlTQgM/KZMN50BJ79cXw=
### END TEST KITCHEN ONLY ###
+ - rvm: 2.2
+ sudo: required
+ dist: trusty
+ os: linux
+ cache:
+ before_install:
+ - sudo apt-get update
+ - sudo apt-get -y install squid3 git
+ env: PROXY_TESTS_DIR=/tmp/proxy_tests
+ script:
+ - bundle exec chef-client --version
+ - git clone https://github.com/chef/proxy_tests.git
+ - cd proxy_tests
+ - bundle exec chef-client -z -o proxy_tests::render
+ #- sh /tmp/proxy_tests/setup.sh
+ - bundle exec sudo -E bash /tmp/proxy_tests/run_tests.sh chef_client \* \* /tmp/out.txt
+ after_script: cat /tmp/out.txt
+
notifications:
on_change: true
on_failure: true