diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c8557bf..e47f3fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,11 +66,11 @@ jobs: - max molecule-scenario: - ubuntu-min-java-max-lts-online - # - ubuntu-min-java-max-non-lts-online + - ubuntu-min-java-max-non-lts-online - ubuntu-min-java-old-lts-online - ubuntu-max-java-min-offline - ubuntu-max-java-max-lts-offline - # - ubuntu-max-java-max-non-lts-offline + - ubuntu-max-java-max-non-lts-offline - ubuntu-max-java-old-lts-offline - debian-max-java-min-offline - debian-max-java-max-lts-offline diff --git a/molecule/java-max-non-lts-offline/converge.yml b/molecule/java-max-non-lts-offline/converge.yml index 8e06bf4..ef39143 100644 --- a/molecule/java-max-non-lts-offline/converge.yml +++ b/molecule/java-max-non-lts-offline/converge.yml @@ -19,8 +19,8 @@ - name: Download JDK for offline install ansible.builtin.get_url: - url: "https://api.adoptium.net/v3/binary/version/{{ 'jdk-20.0.0+36' | urlencode }}/linux/x64/jdk/hotspot/normal/adoptium?project=jdk" # noqa 204 - dest: '{{ java_local_archive_dir }}/OpenJDK20-jdk_x64_linux_hotspot_20.0.0_36.tar.gz' + url: "https://api.adoptium.net/v3/binary/version/{{ 'jdk-20.0.1+9' | urlencode }}/linux/x64/jdk/hotspot/normal/adoptium?project=jdk" # noqa 204 + dest: '{{ java_local_archive_dir }}/OpenJDK20-jdk_x64_linux_hotspot_20.0.1_9.tar.gz' force: false timeout: '{{ java_download_timeout_seconds }}' mode: 'u=rw,go=r' @@ -30,10 +30,10 @@ - role: ansible-role-java java_use_local_archive: true java_major_version: '20' - java_version: '20.0.0+36' - java_release_name: 'jdk-20.0.0+36' - java_redis_filename: 'OpenJDK20-jdk_x64_linux_hotspot_20.0.0_36.tar.gz' - java_redis_sha256sum: 'fb6000faf47fffcda8caf01f60097d582728a6fffb6c1b85c8075c674f0c9281' + java_version: '20.0.1+9' + java_release_name: 'jdk-20.0.1+9' + java_redis_filename: 'OpenJDK20-jdk_x64_linux_hotspot_20.0.1_9.tar.gz' + java_redis_sha256sum: '43ad054f135a7894dc87ad5d10ad45d8e82846186515892acdbc17c2c5cd27e4' post_tasks: - name: Verify java facts diff --git a/molecule/java-max-non-lts/tests/test_role.py b/molecule/java-max-non-lts/tests/test_role.py index de95d68..134c3fc 100644 --- a/molecule/java-max-non-lts/tests/test_role.py +++ b/molecule/java-max-non-lts/tests/test_role.py @@ -8,7 +8,7 @@ def test_java(host): m = re.search('(?:java|openjdk) version "([0-9]+)', cmd.stderr) assert m is not None java_version = m.group(1) - assert '17' == java_version + assert '20' == java_version def test_javac(host): @@ -17,11 +17,11 @@ def test_javac(host): m = re.search('javac ([0-9]+)', cmd.stdout) assert m is not None java_version = m.group(1) - assert '17' == java_version + assert '20' == java_version @pytest.mark.parametrize('version_dir_pattern', [ - 'jdk-17(\\.[0-9]+\\.[0-9]+)?(\\+[0-9]+)?$' + 'jdk-20(\\.[0-9]+\\.[0-9]+)?(\\+[0-9]+)?$' ]) def test_java_installed(host, version_dir_pattern):