From 705e9bd1bdbb56941386620ee4582c46b89d8280 Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Sat, 2 Oct 2021 21:44:39 +0200
Subject: [PATCH] Fix OSX 10.11 CI runs (#3501) (#3502)

* Restrict to OSX 10.11 tests.

* See whether updating brew helps.

* Skip archive task for OSX.

* Refactor homebrew task to make changing the package name easier.

* Revert "See whether updating brew helps."

This reverts commit 8eceb9ef1f6933236aa7fa17e795411de311b3eb.

* Replace xz by gnu-tar.

* Uninstall first.

* Skip iso_extract task for OSX.

* Revert "Restrict to OSX 10.11 tests."

This reverts commit 81823d2f97379cb684abc02d1a6155fd8b0e7043.

* ci_complete

(cherry picked from commit 106856ed862859eb5bd5ee40f3ae456ff33edef8)

Co-authored-by: Felix Fontein <felix@fontein.de>
---
 tests/integration/targets/archive/aliases     |   1 +
 .../targets/homebrew/tasks/main.yml           | 100 ++++++++++--------
 tests/integration/targets/iso_extract/aliases |   1 +
 3 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/tests/integration/targets/archive/aliases b/tests/integration/targets/archive/aliases
index db9bbd8c42..08f26ea447 100644
--- a/tests/integration/targets/archive/aliases
+++ b/tests/integration/targets/archive/aliases
@@ -2,3 +2,4 @@ needs/root
 shippable/posix/group2
 destructive
 skip/aix
+skip/osx  # FIXME
diff --git a/tests/integration/targets/homebrew/tasks/main.yml b/tests/integration/targets/homebrew/tasks/main.yml
index 7eda2e323f..b961d0e088 100644
--- a/tests/integration/targets/homebrew/tasks/main.yml
+++ b/tests/integration/targets/homebrew/tasks/main.yml
@@ -32,54 +32,66 @@
 #    that:
 #      - upgrade_option_result.changed
 
-- name: Install xz package using homebrew
-  homebrew:
-    name: xz
-    state: present
-    update_homebrew: no
-  become: yes
-  become_user: "{{ brew_stat.stat.pw_name }}"
-  register: xz_result
+- vars:
+    package_name: gnu-tar
 
-- assert:
-    that:
-      - xz_result.changed
+  block:
+  - name: Make sure {{ package_name }} package is not installed
+    homebrew:
+      name: "{{ package_name }}"
+      state: absent
+      update_homebrew: no
+    become: yes
+    become_user: "{{ brew_stat.stat.pw_name }}"
 
-- name: Again install xz package using homebrew
-  homebrew:
-    name: xz
-    state: present
-    update_homebrew: no
-  become: yes
-  become_user: "{{ brew_stat.stat.pw_name }}"
-  register: xz_result
+  - name: Install {{ package_name }} package using homebrew
+    homebrew:
+      name: "{{ package_name }}"
+      state: present
+      update_homebrew: no
+    become: yes
+    become_user: "{{ brew_stat.stat.pw_name }}"
+    register: package_result
 
-- assert:
-    that:
-      - not xz_result.changed
+  - assert:
+      that:
+        - package_result.changed
 
-- name: Uninstall xz package using homebrew
-  homebrew:
-    name: xz
-    state: absent
-    update_homebrew: no
-  become: yes
-  become_user: "{{ brew_stat.stat.pw_name }}"
-  register: xz_result
+  - name: Again install {{ package_name }} package using homebrew
+    homebrew:
+      name: "{{ package_name }}"
+      state: present
+      update_homebrew: no
+    become: yes
+    become_user: "{{ brew_stat.stat.pw_name }}"
+    register: package_result
 
-- assert:
-    that:
-      - xz_result.changed
+  - assert:
+      that:
+        - not package_result.changed
 
-- name: Again uninstall xz package using homebrew
-  homebrew:
-    name: xz
-    state: absent
-    update_homebrew: no
-  become: yes
-  become_user: "{{ brew_stat.stat.pw_name }}"
-  register: xz_result
+  - name: Uninstall {{ package_name }} package using homebrew
+    homebrew:
+      name: "{{ package_name }}"
+      state: absent
+      update_homebrew: no
+    become: yes
+    become_user: "{{ brew_stat.stat.pw_name }}"
+    register: package_result
 
-- assert:
-    that:
-      - not xz_result.changed
+  - assert:
+      that:
+        - package_result.changed
+
+  - name: Again uninstall {{ package_name }} package using homebrew
+    homebrew:
+      name: "{{ package_name }}"
+      state: absent
+      update_homebrew: no
+    become: yes
+    become_user: "{{ brew_stat.stat.pw_name }}"
+    register: package_result
+
+  - assert:
+      that:
+        - not package_result.changed
diff --git a/tests/integration/targets/iso_extract/aliases b/tests/integration/targets/iso_extract/aliases
index 0b484bbab6..5de0229f66 100644
--- a/tests/integration/targets/iso_extract/aliases
+++ b/tests/integration/targets/iso_extract/aliases
@@ -1,3 +1,4 @@
 shippable/posix/group1
 destructive
 skip/aix
+skip/osx  # FIXME