Skip to content

Commit 152b8bf

Browse files
committed
use tags instead of when condition to determine when to run tests.
removed ansible 1.7.2 environment. idempotence tests now pass. removed launchpad_ppa_webupd8_cache_valid_time variable removed extra Tests section from README file.
1 parent 2b16667 commit 152b8bf

File tree

7 files changed

+18
-34
lines changed

7 files changed

+18
-34
lines changed

README.md

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
An [Ansible](http://www.ansible.com) role to setup the [webupd8](http://www.webupd8.org/) launchpad apt repository.
1212

13+
1314
## Tests
1415

1516
| Family | Distribution | Version | Test Status |
@@ -20,20 +21,6 @@ An [Ansible](http://www.ansible.com) role to setup the [webupd8](http://www.webu
2021
| Debian | Ubuntu | Trusty | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
2122
| Debian | Ubuntu | Vivid | [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
2223

23-
## Tests
24-
25-
| Family | Distribution | Version | Test Status |
26-
|:-:|:-:|:-:|:-:|
27-
| Debian | Debian | Jessie | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
28-
| Debian | Debian | Wheezy | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
29-
| Debian | Ubuntu | Precise | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-passed-006400.svg?style=flat)](#) |
30-
| Debian | Ubuntu | Trusty | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
31-
| Debian | Ubuntu | Vivid | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
32-
| RedHat | CentOS | 6.4 | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
33-
| RedHat | CentOS | 6.6 | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
34-
| RedHat | Centos | 7 | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
35-
| RedHat | Fedora | 20 | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
36-
| RedHat | Fedora | 21 | [![x86](http://img.shields.io/badge/x86-n/a-cccccc.svg?style=flat)](#) [![x86_64](http://img.shields.io/badge/x86_64-n/a-cccccc.svg?style=flat)](#) |
3724

3825
## Requirements
3926

@@ -45,16 +32,17 @@ An [Ansible](http://www.ansible.com) role to setup the [webupd8](http://www.webu
4532
|:-:|:--|
4633
| launchpad_ppa_webupd8_os_supported | fact set by this role to determine if the host OS is supported. |
4734

35+
4836
## Role Variables
4937

50-
| variable | description |
51-
|:-:|:--|
52-
| launchpad_ppa_webupd8_cache_valid_time | the amount of time in seconds the apt cache is valid. |
38+
None.
39+
5340

5441
## Dependencies
5542

5643
None.
5744

45+
5846
## Playbooks
5947

6048
Including an example of how to use your role
@@ -65,8 +53,12 @@ is always nice for users too:
6553
roles:
6654
- { role: ansiblebit.launchpad-ppa-webupd8, launchpad_ppa_webupd8_cache_valid_time: 3600 }
6755

56+
6857
## Changelog
6958

59+
- v3.9.4 : 9 Sep 2015
60+
- idempotence tests now pass
61+
- removed launchpad_ppa_webupd8_cache_valid_time variable
7062
- v3.9.2 : 9 Sep 2015
7163
- fixed tests
7264
- v3.9.0 : 9 Sep 2015
@@ -100,14 +92,17 @@ is always nice for users too:
10092
- v1.0.0 : 4 April 2015
10193
- initial release
10294

95+
10396
## Links
10497

10598
- [WebUpd8 team : Oracle Java (JDK) 7 / 8 / 9 Installer PPA](https://launchpad.net/~webupd8team/+archive/ubuntu/java)
10699

100+
107101
## License
108102

109103
BSD
110104

105+
111106
## Author Information
112107

113108
- [steenzout](http://github.com/steenzout)

defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@
33
#
44
# defaults file
55
#
6-
7-
launchpad_ppa_webupd8_cache_valid_time: 3600

tasks/main.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,3 @@
1818
fail:
1919
msg: "The operating system ({{ ansible_os_family }}) of the target machine ({{ inventory_hostname }}) is not currently supported."
2020
when: launchpad_ppa_webupd8_os_supported is not defined
21-
22-
23-
## generic tasks
24-
25-
- apt:
26-
update_cache=yes
27-
cache_valid_time={{ launchpad_ppa_webupd8_cache_valid_time }}
28-
sudo: yes

tasks/os_distribution/debian.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414

1515
- name: ensure the webupd8 launchpad apt repository is present
1616
apt_repository:
17-
repo="deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main"
17+
repo='deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main'
1818
update_cache=yes
1919
state=present
2020
sudo: yes
2121

2222
- name: ensure the webupd8 launchpad source apt repository is present
2323
apt_repository:
24-
repo="deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main"
24+
repo='deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main'
2525
update_cache=yes
2626
state=present
2727
sudo: yes

tasks/os_distribution/ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
- name: ensure the webupd8 launchpad apt repository is present
99
apt_repository:
10-
repo=ppa:webupd8team/java
10+
repo='ppa:webupd8team/java'
1111
update_cache=yes
1212
state=present
1313
sudo: yes

tests/test.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
gather_facts: yes
77

88
roles:
9-
- ansiblebit.launchpad-ppa-webupd8
9+
- launchpad-ppa-webupd8
1010

1111
- { role: tests,
12-
when: idempotence is defined and idempotence }
13-
12+
tags: test }

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
33
# {py27}-{ansible193,ansible184,ansible172,ansible1610,ansible155,ansible145,ansible134,ansible123}
4-
{py27}-{ansible193,ansible184,ansible172}
4+
{py27}-{ansible193,ansible184}
55

66
skipsdist = True
77

0 commit comments

Comments
 (0)