From 100a91fdebdf2d570abd1dc2a5838b148941f43c Mon Sep 17 00:00:00 2001 From: Stanislav Shamilov Date: Sat, 7 Dec 2024 17:56:20 +0200 Subject: [PATCH] adds java dependency variable for different distributions --- .../integration/targets/android_sdk/handlers/main.yml | 5 +++++ tests/integration/targets/android_sdk/tasks/main.yml | 5 +++++ tests/integration/targets/android_sdk/tasks/setup.yml | 10 ++++------ tests/integration/targets/android_sdk/vars/Alpine.yml | 6 ++++++ .../integration/targets/android_sdk/vars/Archlinux.yml | 6 ++++++ tests/integration/targets/android_sdk/vars/Debian.yml | 6 ++++++ tests/integration/targets/android_sdk/vars/FreeBSD.yml | 6 ++++++ tests/integration/targets/android_sdk/vars/RedHat.yml | 6 ++++++ tests/integration/targets/android_sdk/vars/Suse.yml | 6 ++++++ tests/integration/targets/android_sdk/vars/main.yml | 1 + 10 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 tests/integration/targets/android_sdk/vars/Alpine.yml create mode 100644 tests/integration/targets/android_sdk/vars/Archlinux.yml create mode 100644 tests/integration/targets/android_sdk/vars/Debian.yml create mode 100644 tests/integration/targets/android_sdk/vars/FreeBSD.yml create mode 100644 tests/integration/targets/android_sdk/vars/RedHat.yml create mode 100644 tests/integration/targets/android_sdk/vars/Suse.yml diff --git a/tests/integration/targets/android_sdk/handlers/main.yml b/tests/integration/targets/android_sdk/handlers/main.yml index 6a9dc69696..7be9b2436d 100644 --- a/tests/integration/targets/android_sdk/handlers/main.yml +++ b/tests/integration/targets/android_sdk/handlers/main.yml @@ -1,3 +1,8 @@ +--- +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + - name: delete_newroot file: path: "{{ newroot.path }}" diff --git a/tests/integration/targets/android_sdk/tasks/main.yml b/tests/integration/targets/android_sdk/tasks/main.yml index 2f28244358..2e00346d51 100644 --- a/tests/integration/targets/android_sdk/tasks/main.yml +++ b/tests/integration/targets/android_sdk/tasks/main.yml @@ -1,3 +1,8 @@ +--- +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + - import_tasks: setup.yml - name: Setup environment diff --git a/tests/integration/targets/android_sdk/tasks/setup.yml b/tests/integration/targets/android_sdk/tasks/setup.yml index 5e09884037..066af3abee 100644 --- a/tests/integration/targets/android_sdk/tasks/setup.yml +++ b/tests/integration/targets/android_sdk/tasks/setup.yml @@ -1,21 +1,19 @@ +--- # Copyright (c) Ansible Project # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later +- name: Include OS-specific variables + include_vars: '{{ ansible_os_family }}.yml' - name: Install dependencies become: true package: name: -# - java-21-openjdk-headless - - openjdk-17-jdk-headless + - "{{ openjdk_pkg }}" - unzip state: present -- name: Print env - debug: - var: ansible_env - - name: Create Android SDK directory file: path: "{{ android_sdk_location }}" diff --git a/tests/integration/targets/android_sdk/vars/Alpine.yml b/tests/integration/targets/android_sdk/vars/Alpine.yml new file mode 100644 index 0000000000..593925f043 --- /dev/null +++ b/tests/integration/targets/android_sdk/vars/Alpine.yml @@ -0,0 +1,6 @@ +--- +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +openjdk_pkg: openjdk17-jre-headless diff --git a/tests/integration/targets/android_sdk/vars/Archlinux.yml b/tests/integration/targets/android_sdk/vars/Archlinux.yml new file mode 100644 index 0000000000..ff46870671 --- /dev/null +++ b/tests/integration/targets/android_sdk/vars/Archlinux.yml @@ -0,0 +1,6 @@ +--- +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +openjdk_pkg: jre17-openjdk-headless diff --git a/tests/integration/targets/android_sdk/vars/Debian.yml b/tests/integration/targets/android_sdk/vars/Debian.yml new file mode 100644 index 0000000000..ddcfaaf1e3 --- /dev/null +++ b/tests/integration/targets/android_sdk/vars/Debian.yml @@ -0,0 +1,6 @@ +--- +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +openjdk_pkg: openjdk-17-jre-headless diff --git a/tests/integration/targets/android_sdk/vars/FreeBSD.yml b/tests/integration/targets/android_sdk/vars/FreeBSD.yml new file mode 100644 index 0000000000..61c1858423 --- /dev/null +++ b/tests/integration/targets/android_sdk/vars/FreeBSD.yml @@ -0,0 +1,6 @@ +--- +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +openjdk_pkg: openjdk17-jre diff --git a/tests/integration/targets/android_sdk/vars/RedHat.yml b/tests/integration/targets/android_sdk/vars/RedHat.yml new file mode 100644 index 0000000000..40f44bd773 --- /dev/null +++ b/tests/integration/targets/android_sdk/vars/RedHat.yml @@ -0,0 +1,6 @@ +--- +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +openjdk_pkg: java-17-openjdk-headless diff --git a/tests/integration/targets/android_sdk/vars/Suse.yml b/tests/integration/targets/android_sdk/vars/Suse.yml new file mode 100644 index 0000000000..40f44bd773 --- /dev/null +++ b/tests/integration/targets/android_sdk/vars/Suse.yml @@ -0,0 +1,6 @@ +--- +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +openjdk_pkg: java-17-openjdk-headless diff --git a/tests/integration/targets/android_sdk/vars/main.yml b/tests/integration/targets/android_sdk/vars/main.yml index 41ce57ad71..9ba619a6d5 100644 --- a/tests/integration/targets/android_sdk/vars/main.yml +++ b/tests/integration/targets/android_sdk/vars/main.yml @@ -1,3 +1,4 @@ +--- # Copyright (c) Ansible Project # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # SPDX-License-Identifier: GPL-3.0-or-later