remove the java installation function from this role (#171)

* remove the java installation from this role Co-authored-by: nolte <nolte07@googlemail.com>
nolte · Jun 14, 2021 · 78d308e · 78d308e
1 parent 5d3200f
commit 78d308e
Show file tree

Hide file tree

Showing 21 changed files with 36 additions and 60 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,5 +1,13 @@
 ansible-minecraft changelog
 ===========================
+6.0.0
+----------
+
+Braking Change
+~~~~~
+
+- Remove the Java Installation logic from this role, because Minecraft 1.17 required Java 16, more information at (`#169 <https://github.com/nolte/ansible-minecraft/issues/169>`_). So `minecraft_java_external_managed=true` is the new Normal for this Role, using a extra role  ``nolte/ansible-role-msopenjdk <https://github.com/nolte/ansible-role-msopenjdk>`_ for install java.
+
 
 5.0.0
 ----------

diff --git a/README.md b/README.md
@@ -23,6 +23,7 @@ This role installs [Minecraft](https://minecraft.net/) or [Spigot](https://www.s
 
 ### Out of Role Scop
 
+- install a *Java Runtime*, this must be done, before you use this Role, you can use [nolte/ansible-role-msopenjdk](https://github.com/nolte/ansible-role-msopenjdk) for example.
 - executing backups and recovery
 - healthy checks like [Minecraft-Region-Fixer](https://github.com/Fenixin/Minecraft-Region-Fixer)
 - handle utility services like [filebeat](https://www.elastic.co/de/products/beats/filebeat) or [prometheus](https://github.com/prometheus/node_exporter)
@@ -60,6 +61,7 @@ and execute ``ansible-galaxy install -r requirements.yml``
 
 -  Python 3.x on the Ansible control machine to generate user ACLs
 -  Ansible 2.7.0+ on the control machine to fetch the Minecraft version
+-  Existing Compatible Java Runtime for start and install Minecraft on target System.
 
 
 ## Contributing

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -21,4 +21,4 @@ minecraft_eula_accept: false
 minecraft_spigot_url: https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
 minecraft_server_java_ops:
 minecraft_java: /usr/bin/java
-minecraft_java_external_managed: false
+#minecraft_java_external_managed: true
diff --git a/docs/usage/role-variables.rst b/docs/usage/role-variables.rst
@@ -77,9 +77,6 @@ The following variable defaults are defined in ``defaults/main.yml``.
 ``minecraft_server_java_ops``
    additional java ops like remote debug ``-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005`` (default: *none*)
 
-``minecraft_java_external_managed``
-  used for skipping the java installation tasks from this role, for handle Java by external scripts/roles (default: ``false``)
-
 .. _role_config_variabels-minecraft_external_log_conf:
 
 Logging

diff --git a/molecule/ci_single_container/molecule.yml b/molecule/ci_single_container/molecule.yml
@@ -1,4 +1,8 @@
 ---
+dependency:
+  name: galaxy
+  options:
+    role-file: ./molecule/resources/playbooks/requirements.yml
 platforms:
   - name: instance
     image: ${MOL_IMAGE:-"solita/ubuntu-systemd:18.04"}
@@ -20,6 +24,7 @@ provisioner:
         user_accept_minecraft_eula: ${user_accept_minecraft_eula:-"false"}
         mc_version: ${MC_VERSION:-"latest"}
         minecraft_server: ${MC_SERVER_TYPE:-"minecraft"}
+        jdk_used_version: ${JDK_VERSION:-"11"}
   playbooks:
     converge: ../resources/playbooks/playbook.yml
   lint:

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -1,8 +1,8 @@
 ---
 dependency:
   name: galaxy
-#  options:
-#    role-file: ./molecule/resources/playbooks/requirements.yml
+  options:
+    role-file: ./molecule/resources/playbooks/requirements.yml
 driver:
   name: docker
 #lint:
@@ -89,6 +89,7 @@ provisioner:
       minecraftserver:
         user_accept_minecraft_eula: ${mc_accept_eula}
         mc_version: "1.13.1"
+        jdk_used_version: ${JDK_VERSION:-"11"}
   playbooks:
     converge: ../resources/playbooks/playbook.yml
   lint:

diff --git a/molecule/latest/molecule.yml b/molecule/latest/molecule.yml
@@ -1,8 +1,8 @@
 ---
 dependency:
   name: galaxy
-#  options:
-#    role-file: ./molecule/resources/playbooks/requirements.yml
+  options:
+    role-file: ./molecule/resources/playbooks/requirements.yml
 driver:
   name: docker
 #lint:
@@ -74,6 +74,7 @@ provisioner:
       minecraftserver:
         user_accept_minecraft_eula: ${mc_accept_eula}
         mc_version: "latest"
+        jdk_used_version: ${JDK_VERSION:-"16"}
   playbooks:
     converge: ../resources/playbooks/playbook.yml
   lint:

diff --git a/molecule/resources/playbooks/playbook.yml b/molecule/resources/playbooks/playbook.yml
@@ -17,6 +17,9 @@
         - unzip
         - rsync
 
+    - include_role: 
+        name: nolte.msopenjdk
+
   roles:
     - role: "{{ playbook_dir }}/./../../../"
       minecraft_version: "{{ mc_version | default('1.13.1') }}"

diff --git a/molecule/resources/playbooks/requirements.yml b/molecule/resources/playbooks/requirements.yml
@@ -0,0 +1,2 @@
+roles:
+  - name: nolte.msopenjdk
diff --git a/molecule/resources/tests/test_default.py b/molecule/resources/tests/test_default.py
@@ -7,17 +7,6 @@
 ).get_hosts("all")
 
 
-def test_java_package_exists(host):
-    if host.system_info.distribution == "centos":
-        java = "java-1.8.0-openjdk"
-    elif host.system_info.distribution == "debian":
-        java = "openjdk-8-jdk"
-    else:
-        java = "default-jdk"
-
-    host.package(java).is_installed
-
-
 def test_gameport_is_open(host):
     host.socket("tcp://0.0.0.0:25565").is_listening
 

diff --git a/molecule/spigot/molecule.yml b/molecule/spigot/molecule.yml
@@ -1,6 +1,8 @@
 ---
 dependency:
   name: galaxy
+  options:
+    role-file: ./molecule/resources/playbooks/requirements.yml  
 driver:
   name: docker
 #lint:
@@ -88,6 +90,7 @@ provisioner:
         user_accept_minecraft_eula: ${mc_accept_eula}
         minecraft_server: spigot
         mc_version: 1.13.1
+        jdk_used_version: ${JDK_VERSION:-"11"}
   playbooks:
     converge: ../resources/playbooks/playbook.yml
   lint:

diff --git a/molecule/spigot_with_plugins/molecule.yml b/molecule/spigot_with_plugins/molecule.yml
@@ -1,8 +1,8 @@
 ---
 dependency:
   name: galaxy
-#  options:
-#    role-file: ./molecule/resources/playbooks/requirements.yml
+  options:
+    role-file: ./molecule/resources/playbooks/requirements.yml
 driver:
   name: docker
 platforms:
@@ -43,6 +43,7 @@ provisioner:
         user_accept_minecraft_eula: ${mc_accept_eula:-false}
         minecraft_server: spigot
         mc_version: 1.13.1
+        jdk_used_version: ${JDK_VERSION:-"11"}
         minecraft_plugins_set_version: "minimal"
         minecraft_plugin_sets:
           minimal:

diff --git a/tasks/setup/java/prepare_java_dependencies.yml b/tasks/setup/java/prepare_java_dependencies.yml
diff --git a/tasks/setup/main.yml b/tasks/setup/main.yml
@@ -1,21 +1,5 @@
 ---
 
-- name: load system specific vars
-  include_vars: "{{ lookup('first_found', params) }}"
-  vars:
-    params:
-      files:
-        - "{{ ansible_distribution_release }}.yml"
-        - "{{ ansible_distribution }}.yml"
-        - "{{ ansible_os_family }}.yml"
-        - "default.yml"
-      paths:
-        - 'vars'
-
-- name: install java dependency
-  include: java/prepare_java_dependencies.yml
-  when: not minecraft_java_external_managed
-
 - name: install spigot package
   package:
     name: "{{ item }}"

diff --git a/tox.ini b/tox.ini
@@ -58,7 +58,8 @@ setenv =
     latest: MOL_TESTINFRA_ADDITIONAL_TESTS= ""
     fixversion: MC_VERSION = "1.13.1"
     oldversion: MC_VERSION = "1.9"
-    latest: MC_VERSION = "1.16.4" #latest
+    latest: MC_VERSION = "latest"
+    latest: JDK_VERSION = "16"
 deps= -r{toxinidir}/requirementsDev.txt
 commands =
     molecule --base-config ./molecule/resources/molecule-maintenance-base.yml --env-file {env:DOCKER_CONFIG_FILE} test -s ci_single_container
@@ -78,6 +79,7 @@ setenv =
     user_accept_minecraft_eula={env:mc_accept_eula}
     mc_accept_eula={env:mc_accept_eula}
     MOL_TESTINFRA_UNIT_REPORT={envtmpdir}/molecule-report.xml
+    JDK_VERSION="11"
 deps= -r{toxinidir}/requirementsDev.txt
 commands =
   molecule --env-file ./molecule/resources/envs-blanko.yml test -s spigot_with_plugins

diff --git a/vars/Alpine.yml b/vars/Alpine.yml
diff --git a/vars/Debian.yml b/vars/Debian.yml
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
diff --git a/vars/default.yml b/vars/default.yml
diff --git a/vars/jessie.yml b/vars/jessie.yml
diff --git a/vars/xenial.yml b/vars/xenial.yml