Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ansiblebit/launchpad-ppa-webupd8
Browse files Browse the repository at this point in the history
  • Loading branch information
steenzout committed Apr 28, 2015
2 parents 9ae4871 + 38b75da commit 565c456
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 3 deletions.
9 changes: 6 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ language: python
python: 2.7

install:
- pip install tox
- sudo apt-get update -q
- sudo apt-get install -q virtualbox --fix-missing
- sudo wget -nv https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.deb
- sudo dpkg -i vagrant_1.7.2_x86_64.deb
- pip install tox

script:
- tox

- tox
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ is always nice for users too:

## Changelog

- v1.0.4 : 28 April 2015
- update_cache is now run with sudo privileges
- v1.0.2 : 17 April 2015
- update_cache=yes when adding new repositories
- v1.0.0 : 4 April 2015
- initial release

Expand Down
1 change: 1 addition & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@
- apt:
update_cache=yes
cache_valid_time={{ ppa_webupd8_cache_valid_time }}
sudo: yes
2 changes: 2 additions & 0 deletions tasks/os_distribution/debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@
- name: ensure the webupd8 launchpad apt repository is present
apt_repository:
repo="deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main"
update_cache=yes
state=present
sudo: yes

- name: ensure the webupd8 launchpad apt repository is present
apt_repository:
repo="deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main"
update_cache=yes
state=present
sudo: yes
1 change: 1 addition & 0 deletions tasks/os_distribution/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
- name: ensure the webupd8 launchpad apt repository is present
apt_repository:
repo=ppa:webupd8team/java
update_cache=yes
state=present
sudo: yes
1 change: 1 addition & 0 deletions tests/ansible.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[defaults]
host_key_checking = False
roles_path=../../

0 comments on commit 565c456

Please sign in to comment.