summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Borean <jborean93@gmail.com>2018-12-14 10:46:16 +1000
committerMatt Clay <matt@mystile.com>2018-12-13 19:07:20 -0800
commit841b5edc92f0b5f2dad31bf8bb47505e5ea59508 (patch)
tree1375bccb84c7247c77fa8897b30134e5e5478942
parent208ef773653303302eac8fc03859c6adf10a5656 (diff)
downloadansible-841b5edc92f0b5f2dad31bf8bb47505e5ea59508.tar.gz
ansible-test: do not upgrade homebrew to speed up tests (#49914)
(cherry picked from commit 695feea541fdc890c51350f1bef0f05b798fa035)
-rw-r--r--test/integration/targets/archive/tasks/main.yml4
-rw-r--r--test/integration/targets/iso_extract/tasks/7zip.yml4
-rw-r--r--test/integration/targets/lookup_passwordstore/tasks/package.yml4
3 files changed, 12 insertions, 0 deletions
diff --git a/test/integration/targets/archive/tasks/main.yml b/test/integration/targets/archive/tasks/main.yml
index 69e3047efd..bf3530b3aa 100644
--- a/test/integration/targets/archive/tasks/main.yml
+++ b/test/integration/targets/archive/tasks/main.yml
@@ -55,6 +55,10 @@
update_homebrew: no
become: yes
become_user: "{{ brew_stat.stat.pw_name }}"
+ # Newer versions of brew want to compile a package which takes a long time. Do not upgrade homebrew until a
+ # proper solution can be found
+ environment:
+ HOMEBREW_NO_AUTO_UPDATE: True
when:
- ansible_python_version.split('.')[0] == '2'
- ansible_os_family == 'Darwin'
diff --git a/test/integration/targets/iso_extract/tasks/7zip.yml b/test/integration/targets/iso_extract/tasks/7zip.yml
index 420524c445..266088e639 100644
--- a/test/integration/targets/iso_extract/tasks/7zip.yml
+++ b/test/integration/targets/iso_extract/tasks/7zip.yml
@@ -79,6 +79,10 @@
become: yes
become_user: "{{ brew_stat.stat.pw_name }}"
when: ansible_distribution in ['MacOSX']
+ # Newer versions of brew want to compile a package which takes a long time. Do not upgrade homebrew until a
+ # proper solution can be found
+ environment:
+ HOMEBREW_NO_AUTO_UPDATE: True
- name: Install 7zip package if we are on FreeBSD
pkgng:
diff --git a/test/integration/targets/lookup_passwordstore/tasks/package.yml b/test/integration/targets/lookup_passwordstore/tasks/package.yml
index e3e5981a2e..75664c3851 100644
--- a/test/integration/targets/lookup_passwordstore/tasks/package.yml
+++ b/test/integration/targets/lookup_passwordstore/tasks/package.yml
@@ -48,3 +48,7 @@
become: yes
become_user: "{{ brew_stat.stat.pw_name }}"
when: ansible_pkg_mgr == 'homebrew'
+ # Newer versions of brew want to compile a package which takes a long time. Do not upgrade homebrew until a
+ # proper solution can be found
+ environment:
+ HOMEBREW_NO_AUTO_UPDATE: True