diff options
| author | Matt Clay <matt@mystile.com> | 2020-08-27 21:08:38 +0200 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2020-08-28 00:48:11 +0200 |
| commit | 2bbcbe99fdc61a0885eae9d14b4c74883c12601b (patch) | |
| tree | c89638629dabdc313456001aed18a365aff888b5 /test/lib | |
| parent | add skeleton 2.11 base roadmap (#71478) (diff) | |
| download | ansible-2bbcbe99fdc61a0885eae9d14b4c74883c12601b.tar.xz ansible-2bbcbe99fdc61a0885eae9d14b4c74883c12601b.zip | |
Support macOS 10.15 for ansible-test --remote.
Use of this new version is experimental, so it is not enabled in CI yet.
Diffstat (limited to 'test/lib')
| -rw-r--r-- | test/lib/ansible_test/_data/completion/remote.txt | 1 | ||||
| -rw-r--r-- | test/lib/ansible_test/_data/setup/remote.sh | 11 | ||||
| -rw-r--r-- | test/lib/ansible_test/_internal/core_ci.py | 1 | ||||
| -rw-r--r-- | test/lib/ansible_test/_internal/manage_ci.py | 2 |
4 files changed, 15 insertions, 0 deletions
diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index ddef2c3e55..0ad20538c9 100644 --- a/test/lib/ansible_test/_data/completion/remote.txt +++ b/test/lib/ansible_test/_data/completion/remote.txt @@ -1,6 +1,7 @@ freebsd/11.1 python=2.7,3.6 python_dir=/usr/local/bin freebsd/12.1 python=3.6,2.7 python_dir=/usr/local/bin osx/10.11 python=2.7 python_dir=/usr/local/bin +macos/10.15 python=3.8 python_dir=/usr/local/bin rhel/7.6 python=2.7 rhel/7.8 python=2.7 rhel/8.1 python=3.6 diff --git a/test/lib/ansible_test/_data/setup/remote.sh b/test/lib/ansible_test/_data/setup/remote.sh index f6b537009b..654f678d38 100644 --- a/test/lib/ansible_test/_data/setup/remote.sh +++ b/test/lib/ansible_test/_data/setup/remote.sh @@ -88,6 +88,14 @@ elif [ "${platform}" = "centos" ]; then done install_pip +elif [ "${platform}" = "macos" ]; then + while true; do + pip3 install --disable-pip-version-check --quiet \ + 'virtualenv<20' \ + && break + echo "Failed to install packages. Sleeping before trying again..." + sleep 10 + done elif [ "${platform}" = "osx" ]; then while true; do pip install --disable-pip-version-check --quiet \ @@ -148,4 +156,7 @@ EOF # Make sure ~/ansible/ is the starting directory for interactive shells. if [ "${platform}" = "osx" ]; then echo "cd ~/ansible/" >> ~/.bashrc +elif [ "${platform}" = "macos" ] ; then + echo "export BASH_SILENCE_DEPRECATION_WARNING=1" >> ~/.bashrc + echo "cd ~/ansible/" >> ~/.bashrc fi diff --git a/test/lib/ansible_test/_internal/core_ci.py b/test/lib/ansible_test/_internal/core_ci.py index b1e9dd9f2a..dfa42a2867 100644 --- a/test/lib/ansible_test/_internal/core_ci.py +++ b/test/lib/ansible_test/_internal/core_ci.py @@ -111,6 +111,7 @@ class AnsibleCoreCI: 'centos arch=power', # avoid ibmvpc as default for no-arch centos to avoid making centos default to power ), parallels=( + 'macos', 'osx', ), ) diff --git a/test/lib/ansible_test/_internal/manage_ci.py b/test/lib/ansible_test/_internal/manage_ci.py index a1da541171..e81dad6899 100644 --- a/test/lib/ansible_test/_internal/manage_ci.py +++ b/test/lib/ansible_test/_internal/manage_ci.py @@ -211,6 +211,8 @@ class ManagePosixCI: self.become = ['sudo', '-in', 'sh', '-c'] else: raise NotImplementedError('provider %s has not been implemented' % self.core_ci.provider) + elif self.core_ci.platform == 'macos': + self.become = ['sudo', '-in', 'PATH=/usr/local/bin:$PATH', 'sh', '-c'] elif self.core_ci.platform == 'osx': self.become = ['sudo', '-in', 'PATH=/usr/local/bin:$PATH'] elif self.core_ci.platform == 'rhel' or self.core_ci.platform == 'centos': |