Skip to content

Commit

Permalink
Make 2.2.14 the default version
Browse files Browse the repository at this point in the history
  • Loading branch information
tersmitten committed Dec 10, 2020
1 parent e528288 commit 4b81632
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
skip_list:
warn_list:
- '106'
- '204'
27 changes: 24 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ python:

env:
- ANSIBLE_VERSION=latest
- ANSIBLE_VERSION=2.10.2
- ANSIBLE_VERSION=2.10.1
- ANSIBLE_VERSION=2.10.0
- ANSIBLE_VERSION=2.9.14
Expand Down Expand Up @@ -45,6 +44,18 @@ env:
- ANSIBLE_VERSION=2.8.1
- ANSIBLE_VERSION=2.8.0

jobs:
include:
- python: "3.8"
env: ANSIBLE_VERSION=latest ANSIBLE_LINT_VERSION=latest
exclude:
- python: "2.7"
env: ANSIBLE_VERSION=latest
- python: "2.7"
env: ANSIBLE_VERSION=2.10.2
- python: "2.7"
env: ANSIBLE_VERSION=2.10.1

branches:
only:
- master
Expand All @@ -58,7 +69,14 @@ before_install:
install:
# Install Ansible.
- if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install ansible; else pip install ansible==$ANSIBLE_VERSION; fi
- if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install ansible-lint; fi
- >
if [ -n "$ANSIBLE_LINT_VERSION" ]; then
if [ "$ANSIBLE_LINT_VERSION" = "latest" ]; then
pip install ansible-lint;
else
pip install ansible-lint==$ANSIBLE_LINT_VERSION;
fi
fi
script:
# Check the role/playbook's syntax.
Expand All @@ -74,7 +92,10 @@ script:
&& (echo 'Idempotence test: pass' && exit 0)
|| (echo 'Idempotence test: fail' && exit 1)
- if [ "$ANSIBLE_VERSION" = "latest" ]; then ansible-lint tests/test.yml; fi
- >
if [ -n "$ANSIBLE_LINT_VERSION" ]; then
ansible-lint tests/test.yml;
fi
notifications:
email: false
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN rm -rf $HOME/.cache
# ansible
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc libffi-dev libssl-dev && \
apt-get clean
RUN pip install ansible==2.9.14
RUN pip install ansible==2.9.15
RUN rm -rf $HOME/.cache

# provision
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ None

#### Variables

* `vagrant_version` [default: `2.2.13`]: Version to install
* `vagrant_version` [default: `2.2.14`]: Version to install

## Dependencies

Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# defaults file for vagrant
---
vagrant_version: 2.2.13
vagrant_version: 2.2.14

0 comments on commit 4b81632

Please sign in to comment.