diff --git a/molecule/debian9_jdk11/Dockerfile.j2 b/molecule/centos6/Dockerfile.j2 similarity index 100% rename from molecule/debian9_jdk11/Dockerfile.j2 rename to molecule/centos6/Dockerfile.j2 diff --git a/molecule/debian9_jdk11/molecule.yml b/molecule/centos6/molecule.yml similarity index 74% rename from molecule/debian9_jdk11/molecule.yml rename to molecule/centos6/molecule.yml index ba442cb..36503b1 100644 --- a/molecule/debian9_jdk11/molecule.yml +++ b/molecule/centos6/molecule.yml @@ -6,20 +6,20 @@ driver: lint: name: yamllint platforms: - - name: debian9 - image: debian:9 + - name: centos6 + image: centos:6 volumes: - /tmp/java:/tmp/java groups: - - debian + - fedora provisioner: name: ansible playbooks: - converge: playbook.yml + converge: ../default/playbook.yml lint: name: ansible-lint scenario: - name: debian9_jdk11 + name: centos6 verifier: name: testinfra directory: ../default/tests/ diff --git a/molecule/debian9_jdk11/playbook.yml b/molecule/debian9_jdk11/playbook.yml deleted file mode 100644 index 01d904c..0000000 --- a/molecule/debian9_jdk11/playbook.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: Converge - hosts: all - - vars: - - java_download_path: /tmp/java - - java_remove_download: false - - java_version: 11 - # - java_subversion: "" - - java_download_from: oracle - - java_set_java_home: true - - roles: - - role: ansible-oracle-java diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 751ddda..9ddd852 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -9,10 +9,10 @@ def test_java(host): assert host.exists("java") - assert host.exists("javac") - assert host.exists("jar") if (host.system_info.distribution != "opensuse-leap"): + assert host.exists("javac") + assert host.exists("jar") assert host.exists("keytool") assert host.run_test("java -version") diff --git a/tasks/install.yml b/tasks/install.yml index cc13187..1b42b75 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -84,12 +84,16 @@ name: javac link: /usr/bin/javac path: "{{ java_install_dir }}/{{ java_default_link_name }}/bin/javac" + # Does not work for OpenSuse, because there javac is a slave of java + when: ansible_pkg_mgr != "zypper" - name: Alternatives link for "jar" alternatives: name: jar link: /usr/bin/jar path: "{{ java_install_dir }}/{{ java_default_link_name }}/bin/jar" + # Does not work for OpenSuse, because there jar is a slave of java + when: ansible_pkg_mgr != "zypper" - name: Alternatives link for "keytool" alternatives: