test: fix opensuse tests

srsp · Nov 4, 2019 · de0ec2a · de0ec2a
1 parent 3524862
commit de0ec2a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 21 deletions.
diff --git a/molecule/debian9_jdk11/Dockerfile.j2 → molecule/centos6/Dockerfile.j2 b/molecule/debian9_jdk11/Dockerfile.j2 → molecule/centos6/Dockerfile.j2
diff --git a/molecule/debian9_jdk11/molecule.yml → molecule/centos6/molecule.yml b/molecule/debian9_jdk11/molecule.yml → 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
diff --git 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
@@ -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: