mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-10-23 12:33:59 -07:00
iso_extract: Reimplement using 7zip (not requiring root) (#24937)
* Reimplement iso_extract using 7zip (not requiring root) So one of the drawbacks of the original implementation is that it required root for mounting/unmount the ISO image. This is now no longer needed as we use 7zip for extracting files from the ISO. * Fall back to using mount/umount if 7zip not found As discussed with others. Also improved integration tests.
This commit is contained in:
Dag Wieers
jctanner
parent
9364fa202f
commit
25e67d804c
8 changed files with 307 additions and 60 deletions
74
test/integration/targets/iso_extract/tasks/7zip.yml
Normal file
74
test/integration/targets/iso_extract/tasks/7zip.yml
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
# Test code for the iso_extract module.
|
||||
# (c) 2017, James Tanner <tanner.jc@gmail.com>
|
||||
# (c) 2017, Dag Wieers <dag@wieers.com>
|
||||
|
||||
# This file is part of Ansible
|
||||
#
|
||||
# Ansible is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Ansible is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
- name: Gather facts
|
||||
setup:
|
||||
become: yes
|
||||
|
||||
- name: Add EPEL repository
|
||||
yum_repository:
|
||||
name: epel
|
||||
description: EPEL yum repo
|
||||
baseurl: https://download.fedoraproject.org/pub/epel/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/
|
||||
state: present
|
||||
when: ansible_distribution in ['CentOS']
|
||||
|
||||
- name: Install 7zip package if we are on Fedora or CentOS
|
||||
yum:
|
||||
name: p7zip-plugins
|
||||
state: installed
|
||||
update_cache: yes
|
||||
become: yes
|
||||
when: ansible_distribution in ['Fedora', 'CentOS']
|
||||
|
||||
- name: Install 7zip package if we are on OpenSUSE
|
||||
zypper:
|
||||
name: p7zip
|
||||
state: installed
|
||||
update_cache: yes
|
||||
become: yes
|
||||
when: ansible_distribution in ['openSUSE Leap']
|
||||
|
||||
- name: Install 7zip package if we are on Ubuntu
|
||||
apt:
|
||||
name: p7zip-full
|
||||
state: installed
|
||||
update_cache: yes
|
||||
become: yes
|
||||
when: ansible_distribution in ['Ubuntu']
|
||||
|
||||
# FIXME: The homebrew module no longer seems to work
|
||||
# "Error: Running Homebrew as root is extremely dangerous."
|
||||
- name: Install 7zip package if we are on MacOSX
|
||||
# macports:
|
||||
# name: p7zip
|
||||
# state: installed
|
||||
# update_cache: yes
|
||||
homebrew:
|
||||
name: p7zip
|
||||
state: present
|
||||
update_homebrew: yes
|
||||
when: ansible_distribution in ['MacOSX']
|
||||
|
||||
- name: Install 7zip package if we are on FreeBSD
|
||||
pkgng:
|
||||
name: p7zip
|
||||
state: present
|
||||
become: yes
|
||||
when: ansible_distribution in ['FreeBSD']
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
# Test code for the iso_extract module.
|
||||
# (c) 2017, James Tanner <tanner.jc@gmail.com>
|
||||
# (c) 2017, Dag Wieers <dag@wieers.com>
|
||||
|
||||
# This file is part of Ansible
|
||||
#
|
||||
|
|
@ -16,30 +17,27 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
- set_fact: output_dir_test={{output_dir}}/test_command_raw
|
||||
- set_fact:
|
||||
output_dir_test: '{{ output_dir }}/test_iso_extract'
|
||||
|
||||
- name: make sure our testing sub-directory does not exist
|
||||
file: path="{{ output_dir_test }}" state=absent
|
||||
- name: Install 7zip
|
||||
include_tasks: 7zip.yml
|
||||
|
||||
- name: create our testing sub-directory
|
||||
file: path="{{ output_dir_test }}" state=directory
|
||||
- name: Prepare environment
|
||||
include_tasks: prepare.yml
|
||||
|
||||
##
|
||||
## iso_extract
|
||||
##
|
||||
- name: Test in normal mode
|
||||
include_tasks: tests.yml
|
||||
vars:
|
||||
in_check_mode: no
|
||||
|
||||
- name: copy the iso to the test dir
|
||||
copy:
|
||||
src: test.iso
|
||||
dest: "{{ output_dir_test }}"
|
||||
- name: Prepare environment
|
||||
include_tasks: prepare.yml
|
||||
|
||||
- name: extract the iso
|
||||
iso_extract:
|
||||
image: "{{ output_dir_test }}/test.iso"
|
||||
dest: "{{ output_dir_test }}"
|
||||
files:
|
||||
- 1.txt
|
||||
- 2.txt
|
||||
register: iso_extract_test0
|
||||
- name: Test in check-mode
|
||||
include_tasks: tests.yml
|
||||
vars:
|
||||
in_check_mode: yes
|
||||
check_mode: yes
|
||||
|
||||
# FIXME - fill this in after figuring out how to allow mounts
|
||||
|
|
|
|||
33
test/integration/targets/iso_extract/tasks/prepare.yml
Normal file
33
test/integration/targets/iso_extract/tasks/prepare.yml
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
# Test code for the iso_extract module.
|
||||
# (c) 2017, James Tanner <tanner.jc@gmail.com>
|
||||
# (c) 2017, Dag Wieers <dag@wieers.com>
|
||||
|
||||
# This file is part of Ansible
|
||||
#
|
||||
# Ansible is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Ansible is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
- name: Make sure our testing sub-directory does not exist
|
||||
file:
|
||||
path: '{{ output_dir_test }}'
|
||||
state: absent
|
||||
|
||||
- name: Create our testing sub-directory
|
||||
file:
|
||||
path: '{{ output_dir_test }}'
|
||||
state: directory
|
||||
|
||||
- name: copy the iso to the test dir
|
||||
copy:
|
||||
src: test.iso
|
||||
dest: '{{ output_dir_test }}'
|
||||
52
test/integration/targets/iso_extract/tasks/tests.yml
Normal file
52
test/integration/targets/iso_extract/tasks/tests.yml
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
# Test code for the iso_extract module.
|
||||
# (c) 2017, James Tanner <tanner.jc@gmail.com>
|
||||
# (c) 2017, Dag Wieers <dag@wieers.com>
|
||||
|
||||
# This file is part of Ansible
|
||||
#
|
||||
# Ansible is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Ansible is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
- name: Extract the iso
|
||||
iso_extract:
|
||||
image: '{{ output_dir_test }}/test.iso'
|
||||
dest: '{{ output_dir_test }}'
|
||||
files:
|
||||
- 1.txt
|
||||
- 2.txt
|
||||
register: iso_extract_test0
|
||||
|
||||
- assert:
|
||||
that:
|
||||
- iso_extract_test0|changed == true
|
||||
|
||||
- name: Extract the iso again
|
||||
iso_extract:
|
||||
image: '{{ output_dir_test }}/test.iso'
|
||||
dest: '{{ output_dir_test }}'
|
||||
files:
|
||||
- 1.txt
|
||||
- 2.txt
|
||||
register: iso_extract_test0_again
|
||||
|
||||
- name: Test iso_extract_test0_again (normal mode)
|
||||
assert:
|
||||
that:
|
||||
- iso_extract_test0_again|changed == false
|
||||
when: not in_check_mode
|
||||
|
||||
- name: Test iso_extract_test0_again (check-mode)
|
||||
assert:
|
||||
that:
|
||||
- iso_extract_test0_again|changed == true
|
||||
when: in_check_mode
|
||||
Loading…
Add table
Add a link
Reference in a new issue