1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Move 'docker' homebrew tests into homebrew tests (#8395)

Move 'docker' homebrew tests into homebrew tests.
This commit is contained in:
Felix Fontein 2024-05-20 09:31:23 +02:00 committed by GitHub
parent 704a5acc63
commit 9b0c983860
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 39 additions and 46 deletions

View file

@ -1,39 +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
- when: ansible_facts.distribution == 'MacOSX'
block:
- name: MACOS | Find brew binary
command: which brew
register: brew_which
- name: MACOS | Get owner of brew binary
stat:
path: "{{ brew_which.stdout }}"
register: brew_stat
- name: MACOS | Install docker without --formula
community.general.homebrew:
name: docker
state: present
become: true
become_user: "{{ brew_stat.stat.pw_name }}"
ignore_errors: true
register: result
- name: Check that installing docker without --formula raises warning
assert:
that:
- result is failed
- name: MACOS | Install docker
community.general.homebrew:
name: docker
state: present
force_formula: true
become: true
become_user: "{{ brew_stat.stat.pw_name }}"
notify:
- uninstall docker

View file

@ -12,13 +12,11 @@
- name: Find brew binary - name: Find brew binary
command: which brew command: which brew
register: brew_which register: brew_which
when: ansible_distribution in ['MacOSX']
- name: Get owner of brew binary - name: Get owner of brew binary
stat: stat:
path: "{{ brew_which.stdout }}" path: "{{ brew_which.stdout }}"
register: brew_stat register: brew_stat
when: ansible_distribution in ['MacOSX']
#- name: Use ignored-pinned option while upgrading all #- name: Use ignored-pinned option while upgrading all
# homebrew: # homebrew:

View file

@ -0,0 +1,37 @@
---
# 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: MACOS | Find brew binary
command: which brew
register: brew_which
- name: MACOS | Get owner of brew binary
stat:
path: "{{ brew_which.stdout }}"
register: brew_stat
- name: MACOS | Install docker without --formula
community.general.homebrew:
name: docker
state: present
become: true
become_user: "{{ brew_stat.stat.pw_name }}"
ignore_errors: true
register: result
- name: Check that installing docker without --formula raises warning
assert:
that:
- result is failed
- name: MACOS | Install docker
community.general.homebrew:
name: docker
state: present
force_formula: true
become: true
become_user: "{{ brew_stat.stat.pw_name }}"
notify:
- uninstall docker

View file

@ -12,13 +12,11 @@
- name: Find brew binary - name: Find brew binary
command: which brew command: which brew
register: brew_which register: brew_which
when: ansible_distribution in ['MacOSX']
- name: Get owner of brew binary - name: Get owner of brew binary
stat: stat:
path: "{{ brew_which.stdout }}" path: "{{ brew_which.stdout }}"
register: brew_stat register: brew_stat
when: ansible_distribution in ['MacOSX']
#- name: Use ignored-pinned option while upgrading all #- name: Use ignored-pinned option while upgrading all
# homebrew: # homebrew:

View file

@ -9,9 +9,8 @@
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) # 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 # SPDX-License-Identifier: GPL-3.0-or-later
- block:
- include_tasks: 'formulae.yml'
- when: ansible_distribution in ['MacOSX'] - when: ansible_distribution in ['MacOSX']
block: block:
- include_tasks: 'formulae.yml'
- include_tasks: 'casks.yml' - include_tasks: 'casks.yml'
- include_tasks: 'docker.yml'