summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Geerling <geerlingguy@mac.com>2018-02-18 11:11:09 -0600
committerJeff Geerling <geerlingguy@mac.com>2018-02-18 11:11:09 -0600
commitfb324684da250a5d847f2ad1f8b02348e9b535dd (patch)
tree1b64865320c426891264fbe01463bf8ca92c6228
parent1e7fa7a87bd349c955980395f9b770a31752d4f9 (diff)
downloadntp-fb324684da250a5d847f2ad1f8b02348e9b535dd.tar.gz
ntp-fb324684da250a5d847f2ad1f8b02348e9b535dd.tar.bz2
ntp-fb324684da250a5d847f2ad1f8b02348e9b535dd.tar.xz
ntp-fb324684da250a5d847f2ad1f8b02348e9b535dd.zip
Update test docs and version of ansible-role-test used.
-rw-r--r--.travis.yml2
-rw-r--r--tests/README.md6
2 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 461fc5f..f99ab7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ env:
script:
# Download test shim.
- - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/51ef4c5aea346b3f8dd2c2518233a70dac6407d9/ansible-role-test.sh
+ - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/6419f0a8f1b2002f6315df8a2e9d3959fdedc4cd/ansible-role-test.sh
- chmod +x ${PWD}/tests/test.sh
# Run tests.
diff --git a/tests/README.md b/tests/README.md
index 323a451..8227233 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -4,6 +4,8 @@ To run the test playbook(s) in this directory:
1. Install and start Docker.
1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
- - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/51ef4c5aea346b3f8dd2c2518233a70dac6407d9/ansible-role-test.sh`
+ - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/6419f0a8f1b2002f6315df8a2e9d3959fdedc4cd/ansible-role-test.sh`
1. Make the test shim executable: `chmod +x tests/test.sh`.
- 1. Run (from the role root directory) `./tests/test.sh [distro] [optional - playbook]`
+ 1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
+
+If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`