Skip to content

Commit 5401daf

Browse files
committed
merge with primogen v9.
2 parents 4be2d6f + 2f3f5ac commit 5401daf

File tree

4 files changed

+8
-22
lines changed

4 files changed

+8
-22
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ DISCLAIMER: usage of any version of this role implies you have accepted the
3131

3232
## Requirements
3333

34-
- ansible >= 1.9.2
34+
- ansible >= 1.9.3
3535

3636

3737
# Facts
@@ -95,8 +95,10 @@ Use `--skip-tags=debug` if you want to suppress debug information.
9595

9696
- v4.9.0 : 9 Sep 2015
9797
- merged with primogen v9
98-
- [issue #5: removed duplicate parameter](https://github.com/ansiblebit/oracle-java/pull/4) [cyfdecyf](https://github.com/cyfdecyf)
98+
- [pull request #5: removed duplicate parameter](https://github.com/ansiblebit/oracle-java/pull/4) [cyfdecyf](https://github.com/cyfdecyf)
9999
- remove duplicate provision task
100+
- ansible 1.9.3 requirement
101+
- run test play as provisioning and idempotence test depending on context
100102
- v4.7.2 : 24 Aug 2015
101103
- usage of alternatives module to set Java default version on RedHat environments
102104
- updated default version to Java 1.8u60-b27

meta/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ galaxy_info:
88
description: Role to install Oracle Java.
99
company: ansiblebit.org
1010
license: BSD
11-
min_ansible_version: 1.8.4
11+
min_ansible_version: 1.9.3
1212
platforms:
1313
- name: CentOS
1414
versions:

tests/test.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
11
---
22
# file: oracle-java/tests/test.yml
33

4-
- name: provisioning play
5-
hosts: all
6-
gather_facts: yes
7-
8-
vars:
9-
test_java_version: 8
10-
test_java_version_update: 60
11-
test_java_version_build: 27
12-
13-
roles:
14-
- { role: oracle-java,
15-
oracle_java_version: "{{ test_java_version }}",
16-
oracle_java_version_update: "{{ test_java_version_update }}",
17-
oracle_java_version_build: "{{ test_java_version_build }}",
18-
oracle_java_set_as_default: yes }
19-
204
- name: tests play
215
hosts: all
226
gather_facts: yes

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[tox]
22
envlist =
3-
{py27}-{ansible19}
3+
{py27}-{ansible193}
44

55
skipsdist = True
66

77

88
[testenv]
99
changedir = tests
1010
deps =
11-
travis: ansible==1.9.2
12-
ansible19: ansible==1.9.2
11+
travis: ansible==1.9.3
12+
ansible193: ansible==1.9.3
1313

1414
passenv = ANSIBLE_ASK_SUDO_PASS HOME
1515

0 commit comments

Comments
 (0)