From a7e834071c13b49aabbb17886a4be1f79222b994 Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Mon, 11 Jan 2021 12:20:47 -0500 Subject: [PATCH] Add macOS 11 to CI (#72622) * Fix connection_paramiko_ssh test for macOS 11 * Update Azure Pipelines config * Add changelog --- .azure-pipelines/azure-pipelines.yml | 4 ++-- changelogs/fragments/ci-add-macos-11.yml | 2 ++ ...all-MacOSX-10-python-3.yml => install-Darwin-python-3.yml} | 0 test/integration/targets/setup_paramiko/install.yml | 1 + ...l-MacOSX-10-python-3.yml => uninstall-Darwin-python-3.yml} | 0 test/integration/targets/setup_paramiko/uninstall.yml | 1 + test/lib/ansible_test/_data/completion/remote.txt | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/ci-add-macos-11.yml rename test/integration/targets/setup_paramiko/{install-MacOSX-10-python-3.yml => install-Darwin-python-3.yml} (100%) rename test/integration/targets/setup_paramiko/{uninstall-MacOSX-10-python-3.yml => uninstall-Darwin-python-3.yml} (100%) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index d4665540754..9724950c204 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -87,8 +87,8 @@ stages: - template: templates/matrix.yml parameters: targets: - - name: macOS 10.15 - test: macos/10.15 + - name: macOS 11.1 + test: macos/11.1 - name: RHEL 7.9 test: rhel/7.9 - name: RHEL 8.3 diff --git a/changelogs/fragments/ci-add-macos-11.yml b/changelogs/fragments/ci-add-macos-11.yml new file mode 100644 index 00000000000..7843014922d --- /dev/null +++ b/changelogs/fragments/ci-add-macos-11.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - add macOS 11.1 as a remote target (https://github.com/ansible/ansible/pull/72622) diff --git a/test/integration/targets/setup_paramiko/install-MacOSX-10-python-3.yml b/test/integration/targets/setup_paramiko/install-Darwin-python-3.yml similarity index 100% rename from test/integration/targets/setup_paramiko/install-MacOSX-10-python-3.yml rename to test/integration/targets/setup_paramiko/install-Darwin-python-3.yml diff --git a/test/integration/targets/setup_paramiko/install.yml b/test/integration/targets/setup_paramiko/install.yml index dc30b300e78..1868987dd06 100644 --- a/test/integration/targets/setup_paramiko/install.yml +++ b/test/integration/targets/setup_paramiko/install.yml @@ -14,5 +14,6 @@ - "install-{{ ansible_distribution }}-{{ ansible_distribution_version }}-python-{{ ansible_python.version.major }}.yml" - "install-{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-python-{{ ansible_python.version.major }}.yml" - "install-{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-python-{{ ansible_python.version.major }}.yml" + - "install-{{ ansible_os_family }}-python-{{ ansible_python.version.major }}.yml" - "install-python-{{ ansible_python.version.major }}.yml" - "install-fail.yml" diff --git a/test/integration/targets/setup_paramiko/uninstall-MacOSX-10-python-3.yml b/test/integration/targets/setup_paramiko/uninstall-Darwin-python-3.yml similarity index 100% rename from test/integration/targets/setup_paramiko/uninstall-MacOSX-10-python-3.yml rename to test/integration/targets/setup_paramiko/uninstall-Darwin-python-3.yml diff --git a/test/integration/targets/setup_paramiko/uninstall.yml b/test/integration/targets/setup_paramiko/uninstall.yml index 06c56a82305..e517a2b9a35 100644 --- a/test/integration/targets/setup_paramiko/uninstall.yml +++ b/test/integration/targets/setup_paramiko/uninstall.yml @@ -11,6 +11,7 @@ - "uninstall-{{ ansible_distribution }}-{{ ansible_distribution_version }}-python-{{ ansible_python.version.major }}.yml" - "uninstall-{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-python-{{ ansible_python.version.major }}.yml" - "uninstall-{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-python-{{ ansible_python.version.major }}.yml" + - "uninstall-{{ ansible_os_family }}-python-{{ ansible_python.version.major }}.yml" - "uninstall-{{ ansible_pkg_mgr }}-python-{{ ansible_python.version.major }}.yml" - "uninstall-{{ ansible_pkg_mgr }}.yml" - "uninstall-fail.yml" diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index 7123fdacff3..42380af4c84 100644 --- a/test/lib/ansible_test/_data/completion/remote.txt +++ b/test/lib/ansible_test/_data/completion/remote.txt @@ -3,6 +3,7 @@ freebsd/12.1 python=3.6,2.7 python_dir=/usr/local/bin freebsd/12.2 python=3.7,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 +macos/11.1 python=3.9 python_dir=/usr/local/bin rhel/7.6 python=2.7 rhel/7.8 python=2.7 rhel/7.9 python=2.7