Fix Fedora, it has openjdk 8 and 11.

robertdebock · Nov 7, 2018 · 701f944 · 701f944
1 parent bc384bd
commit 701f944
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/molecule/fedora-latest/molecule.yml b/molecule/fedora-latest/molecule.yml
@@ -12,11 +12,11 @@ platforms:
     image: fedora:latest
   - name: java-fedora-latest-openjdk-8-jre
     image: fedora:latest
-  - name: java-fedora-latest-openjdk-9-jre
+  - name: java-fedora-latest-openjdk-11-jre
     image: fedora:latest
   - name: java-fedora-latest-openjdk-8-jdk
     image: fedora:latest
-  - name: java-fedora-latest-openjdk-9-jdk
+  - name: java-fedora-latest-openjdk-11-jdk
     image: fedora:latest
 provisioner:
   name: ansible

diff --git a/molecule/fedora-rawhide/molecule.yml b/molecule/fedora-rawhide/molecule.yml
@@ -16,10 +16,18 @@ platforms:
     image: fedora:rawhide
     registry:
       url: registry.fedoraproject.org
+  - name: java-fedora-rawhide-openjdk-11-jre
+    image: fedora:rawhide
+    registry:
+      url: registry.fedoraproject.org
   - name: java-fedora-rawhide-openjdk-8-jdk
     image: fedora:rawhide
     registry:
       url: registry.fedoraproject.org
+  - name: java-fedora-rawhide-openjdk-11-jdk
+    image: fedora:rawhide
+    registry:
+      url: registry.fedoraproject.org
 provisioner:
   name: ansible
   lint:

diff --git a/vars/main.yml b/vars/main.yml
@@ -33,6 +33,7 @@ _java_openjdk_package:
       openSUSE Tumbleweed: java-10-openjdk
     11:
       Debian: openjdk-11-jre
+      Fedora: java-11-openjdk
       Ubuntu: openjdk-11-jre
       openSUSE Tumbleweed: java-11-openjdk
   jdk:
@@ -67,6 +68,7 @@ _java_openjdk_package:
       openSUSE Tumbleweed: java-10-openjdk-devel
     11:
       Debian: openjdk-11-jdk
+      Fedora: java-11-openjdk-devel
       Ubuntu: openjdk-11-jdk
       openSUSE Tumbleweed: java-11-openjdk-devel