Skip to content

Commit de0ec2a

Browse files
committed
test: fix opensuse tests
1 parent 3524862 commit de0ec2a

File tree

5 files changed

+11
-21
lines changed

5 files changed

+11
-21
lines changed
File renamed without changes.

molecule/debian9_jdk11/molecule.yml renamed to molecule/centos6/molecule.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ driver:
66
lint:
77
name: yamllint
88
platforms:
9-
- name: debian9
10-
image: debian:9
9+
- name: centos6
10+
image: centos:6
1111
volumes:
1212
- /tmp/java:/tmp/java
1313
groups:
14-
- debian
14+
- fedora
1515
provisioner:
1616
name: ansible
1717
playbooks:
18-
converge: playbook.yml
18+
converge: ../default/playbook.yml
1919
lint:
2020
name: ansible-lint
2121
scenario:
22-
name: debian9_jdk11
22+
name: centos6
2323
verifier:
2424
name: testinfra
2525
directory: ../default/tests/

molecule/debian9_jdk11/playbook.yml

-14
This file was deleted.

molecule/default/tests/test_default.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
def test_java(host):
1010

1111
assert host.exists("java")
12-
assert host.exists("javac")
13-
assert host.exists("jar")
1412

1513
if (host.system_info.distribution != "opensuse-leap"):
14+
assert host.exists("javac")
15+
assert host.exists("jar")
1616
assert host.exists("keytool")
1717

1818
assert host.run_test("java -version")

tasks/install.yml

+4
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,16 @@
8484
name: javac
8585
link: /usr/bin/javac
8686
path: "{{ java_install_dir }}/{{ java_default_link_name }}/bin/javac"
87+
# Does not work for OpenSuse, because there javac is a slave of java
88+
when: ansible_pkg_mgr != "zypper"
8789

8890
- name: Alternatives link for "jar"
8991
alternatives:
9092
name: jar
9193
link: /usr/bin/jar
9294
path: "{{ java_install_dir }}/{{ java_default_link_name }}/bin/jar"
95+
# Does not work for OpenSuse, because there jar is a slave of java
96+
when: ansible_pkg_mgr != "zypper"
9397

9498
- name: Alternatives link for "keytool"
9599
alternatives:

0 commit comments

Comments
 (0)