diff options
| author | Claire McQuin <mcquin@users.noreply.github.com> | 2014-08-14 12:28:49 -0700 |
|---|---|---|
| committer | Claire McQuin <mcquin@users.noreply.github.com> | 2014-08-14 12:28:49 -0700 |
| commit | 8691335ad8d4505b28bf77d1aaa03e10ee9d2056 (patch) | |
| tree | 7292d4ee5e3ab86de3803ecefa7b2225081e842f | |
| parent | da2abd0709f7c7e6c6c83ccf622a4fc5f3424586 (diff) | |
| parent | c3213d64f9f9a9420f0e17a4a4e783de9c32bc5f (diff) | |
| download | chef-8691335ad8d4505b28bf77d1aaa03e10ee9d2056.tar.gz | |
Merge pull request #1829 from opscode/mcquin/travis_secure_env_vars
Run end to end tests conditionally on presence of secure env vars.
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | CHANGELOG.md | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 324edcadc1..c2546351eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,11 +33,12 @@ matrix: before_install: - echo -n $DO_KEY_CHUNK_{0..30} >> ~/.ssh/id_aws.base64 - cat ~/.ssh/id_aws.base64 | tr -d ' ' | base64 --decode > ~/.ssh/id_aws.pem - before_script: cd kitchen-tests + before_script: + - cd kitchen-tests script: - - bundle exec kitchen test + - '[ "$TRAVIS_SECURE_ENV_VARS" = "true" ] && bundle exec kitchen test || true' after_script: - - bundle exec kitchen destroy + - '[ "$TRAVIS_SECURE_ENV_VARS" = "true" ] && bundle exec kitchen destroy || true' env: - KITCHEN_YAML=.kitchen.travis.yml - EC2_SSH_KEY_PATH=~/.ssh/id_aws.pem diff --git a/CHANGELOG.md b/CHANGELOG.md index d71e70627b..5c4e040370 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ * Fix SuSE package removal failure (Issue 1732). * Enable Travis to run Test Kitchen with Kitchen EC2. * End-to-end tests for Ubuntu 12.04 - +* Only run end-to-end tests when secure environment variables are present. * [**Phil Dibowitz**](https://github.com/jaymzh): 'group' provider on OSX properly uses 'dscl' to determine existing groups |