diff options
| author | Sam Doran <sdoran@redhat.com> | 2021-11-19 21:18:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-19 21:18:31 -0500 |
| commit | d8aeffc8b7b7924d22a5910d8b4b00373d8170a4 (patch) | |
| tree | 1d8134b55e5dd7ef2f8922da763bff30fa8db9a3 | |
| parent | 5cbcf7c7bfd5c0cd2a5f8c8817b8e4863f133022 (diff) | |
| download | ansible-d8aeffc8b7b7924d22a5910d8b4b00373d8170a4.tar.gz | |
Add macOS 12 to CI (#76328)
* Disable lookup_url test of macOS 12
| -rw-r--r-- | .azure-pipelines/azure-pipelines.yml | 4 | ||||
| -rw-r--r-- | changelogs/fragments/macos12-ci-image.yml | 2 | ||||
| -rw-r--r-- | test/integration/targets/lookup_url/aliases | 1 | ||||
| -rw-r--r-- | test/lib/ansible_test/_data/completion/remote.txt | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index e528609af7..5b05e94f5a 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -88,8 +88,8 @@ stages: - template: templates/matrix.yml parameters: targets: - - name: macOS 11.1 - test: macos/11.1 + - name: macOS 12.0 + test: macos/12.0 - name: RHEL 7.9 test: rhel/7.9 - name: RHEL 8.5 py36 diff --git a/changelogs/fragments/macos12-ci-image.yml b/changelogs/fragments/macos12-ci-image.yml new file mode 100644 index 0000000000..7ad9c437df --- /dev/null +++ b/changelogs/fragments/macos12-ci-image.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - add macOS 12.0 as a remote target (https://github.com/ansible/ansible/pull/76328) diff --git a/test/integration/targets/lookup_url/aliases b/test/integration/targets/lookup_url/aliases index 90ef161f59..9911b8a36f 100644 --- a/test/integration/targets/lookup_url/aliases +++ b/test/integration/targets/lookup_url/aliases @@ -1,3 +1,4 @@ destructive shippable/posix/group1 needs/httptester +skip/macos/12.0 # This test crashes Python due to https://wefearchange.org/2018/11/forkmacos.rst.html diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index 5439572cb0..2cbcee2715 100644 --- a/test/lib/ansible_test/_data/completion/remote.txt +++ b/test/lib/ansible_test/_data/completion/remote.txt @@ -2,6 +2,7 @@ freebsd/12.2 python=3.7,2.7,3.8 python_dir=/usr/local/bin provider=aws freebsd/13.0 python=3.7,2.7,3.8,3.9 python_dir=/usr/local/bin provider=aws freebsd python_dir=/usr/local/bin provider=aws macos/11.1 python=3.9 python_dir=/usr/local/bin provider=parallels +macos/12.0 python=3.10 python_dir=/usr/local/bin provider=parallels macos python_dir=/usr/local/bin provider=parallels rhel/7.9 python=2.7 provider=aws rhel/8.4 python=3.6,3.8 provider=aws |