mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-06 13:22:48 +00:00
applies code review suggestions
This commit is contained in:
@@ -1,9 +0,0 @@
|
||||
---
|
||||
# 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: "{{ ansible_env.HOME }}/newroot"
|
||||
state: absent
|
||||
@@ -5,3 +5,4 @@
|
||||
|
||||
dependencies:
|
||||
- setup_pkg_mgr
|
||||
- setup_remote_tmp_dir
|
||||
@@ -59,26 +59,19 @@
|
||||
state: latest
|
||||
register: platform_tools_updated
|
||||
|
||||
- name: Create new sdk root
|
||||
file:
|
||||
path: "{{ ansible_env.HOME }}/newroot"
|
||||
state: directory
|
||||
register: newroot
|
||||
notify: delete_newroot
|
||||
|
||||
- name: Accept licenses in the new root
|
||||
shell: "yes | sdkmanager --sdk_root={{ newroot.path }} --licenses"
|
||||
shell: "yes | sdkmanager --sdk_root={{ remote_tmp_dir }} --licenses"
|
||||
|
||||
- name: Install a package to a new root
|
||||
android_sdk:
|
||||
name: build-tools;34.0.0
|
||||
state: present
|
||||
sdk_root: "{{ newroot.path }}"
|
||||
sdk_root: "{{ remote_tmp_dir }}"
|
||||
register: new_root_package
|
||||
|
||||
- name: Check package is installed
|
||||
stat:
|
||||
path: "{{ newroot.path }}/build-tools/34.0.0"
|
||||
path: "{{ remote_tmp_dir }}/build-tools/34.0.0"
|
||||
register: new_root_package_stat
|
||||
|
||||
- name: Install a package from canary channel
|
||||
|
||||
@@ -41,26 +41,19 @@
|
||||
state: absent
|
||||
register: sources_android_26_deleted2
|
||||
|
||||
- name: Create new sdk root (FreeBSD)
|
||||
file:
|
||||
path: "{{ ansible_env.HOME }}/newroot"
|
||||
state: directory
|
||||
register: newroot
|
||||
notify: delete_newroot
|
||||
|
||||
- name: Accept licenses in the new root (FreeBSD)
|
||||
shell: "yes | sdkmanager --sdk_root={{ newroot.path }} --licenses"
|
||||
shell: "yes | sdkmanager --sdk_root={{ remote_tmp_dir }} --licenses"
|
||||
|
||||
- name: Install a package to a new root (FreeBSD)
|
||||
android_sdk:
|
||||
name: sources;android-26
|
||||
state: present
|
||||
sdk_root: "{{ newroot.path }}"
|
||||
sdk_root: "{{ remote_tmp_dir }}"
|
||||
register: new_root_package
|
||||
|
||||
- name: Check package is installed (FreeBSD)
|
||||
stat:
|
||||
path: "{{ newroot.path }}/sources/android-26"
|
||||
path: "{{ remote_tmp_dir }}/sources/android-26"
|
||||
register: new_root_package_stat
|
||||
|
||||
- name: Install a package from canary channel (FreeBSD)
|
||||
|
||||
Reference in New Issue
Block a user