[stable-2.10] Support macOS 10.15 for ansible-test --remote.

Use of this new version is experimental, so it is not enabled in CI yet.
(cherry picked from commit 2bbcbe99fd)

Co-authored-by: Matt Clay <matt@mystile.com>
This commit is contained in:
Matt Clay 2020-08-27 12:08:38 -07:00
parent 356ea0b8d0
commit 4273443686
5 changed files with 17 additions and 0 deletions

View file

@ -0,0 +1,2 @@
minor_changes:
- ansible-test - Add ``macos/10.15`` as a supported value for the ``--remote`` option.

View file

@ -1,6 +1,7 @@
freebsd/11.1 python=2.7,3.6 python_dir=/usr/local/bin 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 freebsd/12.1 python=3.6,2.7 python_dir=/usr/local/bin
osx/10.11 python=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.6 python=2.7
rhel/7.8 python=2.7 rhel/7.8 python=2.7
rhel/8.1 python=3.6 rhel/8.1 python=3.6

View file

@ -88,6 +88,14 @@ elif [ "${platform}" = "centos" ]; then
done done
install_pip 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 elif [ "${platform}" = "osx" ]; then
while true; do while true; do
pip install --disable-pip-version-check --quiet \ pip install --disable-pip-version-check --quiet \
@ -148,4 +156,7 @@ EOF
# Make sure ~/ansible/ is the starting directory for interactive shells. # Make sure ~/ansible/ is the starting directory for interactive shells.
if [ "${platform}" = "osx" ]; then if [ "${platform}" = "osx" ]; then
echo "cd ~/ansible/" >> ~/.bashrc echo "cd ~/ansible/" >> ~/.bashrc
elif [ "${platform}" = "macos" ] ; then
echo "export BASH_SILENCE_DEPRECATION_WARNING=1" >> ~/.bashrc
echo "cd ~/ansible/" >> ~/.bashrc
fi fi

View file

@ -111,6 +111,7 @@ class AnsibleCoreCI:
'centos arch=power', # avoid ibmvpc as default for no-arch centos to avoid making centos default to power 'centos arch=power', # avoid ibmvpc as default for no-arch centos to avoid making centos default to power
), ),
parallels=( parallels=(
'macos',
'osx', 'osx',
), ),
) )

View file

@ -211,6 +211,8 @@ class ManagePosixCI:
self.become = ['sudo', '-in', 'sh', '-c'] self.become = ['sudo', '-in', 'sh', '-c']
else: else:
raise NotImplementedError('provider %s has not been implemented' % self.core_ci.provider) 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': elif self.core_ci.platform == 'osx':
self.become = ['sudo', '-in', 'PATH=/usr/local/bin:$PATH'] self.become = ['sudo', '-in', 'PATH=/usr/local/bin:$PATH']
elif self.core_ci.platform == 'rhel' or self.core_ci.platform == 'centos': elif self.core_ci.platform == 'rhel' or self.core_ci.platform == 'centos':