diff options
| author | Sviatoslav Sydorenko (Святослав Сидоренко) <webknjaz@redhat.com> | 2024-02-16 21:26:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-16 21:26:16 +0100 |
| commit | 386edc666ec2a053b4d576fc4b2deeb46fe492b8 (patch) | |
| tree | a7e6eb99accf4a83031a6a95db4baad5a42a0beb | |
| parent | Proxy more display methods (#81900) (diff) | |
| download | ansible-386edc666ec2a053b4d576fc4b2deeb46fe492b8.tar.xz ansible-386edc666ec2a053b4d576fc4b2deeb46fe492b8.zip | |
Add macOS 14.3 to CI and `ansible-test`
Additionally, this patch takes care of installing GPG within the
`ansible-galaxy-collection` test when running under macOS 14 and higher.
PR #82697
ci_complete
5 files changed, 39 insertions, 4 deletions
diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 50f9231344..4337ae9552 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -77,8 +77,8 @@ stages: - template: templates/matrix.yml # context/target parameters: targets: - - name: macOS 13.2 - test: macos/13.2 + - name: macOS 14.3 + test: macos/14.3 - name: RHEL 9.3 py39 test: rhel/9.3@3.9 - name: RHEL 9.3 py311 @@ -91,8 +91,8 @@ stages: - template: templates/matrix.yml # context/controller parameters: targets: - - name: macOS 13.2 - test: macos/13.2 + - name: macOS 14.3 + test: macos/14.3 - name: RHEL 9.3 test: rhel/9.3 - name: FreeBSD 13.2 diff --git a/changelogs/fragments/ansible-test-added-macos-14.3.yml b/changelogs/fragments/ansible-test-added-macos-14.3.yml new file mode 100644 index 0000000000..85db65ccb1 --- /dev/null +++ b/changelogs/fragments/ansible-test-added-macos-14.3.yml @@ -0,0 +1,6 @@ +--- + +minor_changes: +- ansible-test - Added a macOS 14.3 remote VM. + +... diff --git a/test/integration/targets/ansible-galaxy-collection/handlers/main.yml b/test/integration/targets/ansible-galaxy-collection/handlers/main.yml new file mode 100644 index 0000000000..d58a516406 --- /dev/null +++ b/test/integration/targets/ansible-galaxy-collection/handlers/main.yml @@ -0,0 +1,7 @@ +- name: uninstall gpg + command: brew uninstall gpg + become: yes + become_user: >- + {{ brew_stat.stat.pw_name }} + environment: + HOMEBREW_NO_AUTO_UPDATE: True diff --git a/test/integration/targets/ansible-galaxy-collection/tasks/setup_gpg.yml b/test/integration/targets/ansible-galaxy-collection/tasks/setup_gpg.yml index ddc4d8a6b0..66fe22044a 100644 --- a/test/integration/targets/ansible-galaxy-collection/tasks/setup_gpg.yml +++ b/test/integration/targets/ansible-galaxy-collection/tasks/setup_gpg.yml @@ -7,6 +7,27 @@ - absent - directory +- when: ansible_facts.distribution == 'MacOSX' + block: + - name: MACOS | Find brew binary + command: which brew + register: brew_which + + - name: MACOS | Get owner of brew binary + stat: + path: >- + {{ brew_which.stdout }} + register: brew_stat + + - command: brew install gpg + become: yes + become_user: >- + {{ brew_stat.stat.pw_name }} + environment: + HOMEBREW_NO_AUTO_UPDATE: True + notify: + - uninstall gpg + - name: get username for generating key command: whoami register: user diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index 0680ded7fd..00b660dbc7 100644 --- a/test/lib/ansible_test/_data/completion/remote.txt +++ b/test/lib/ansible_test/_data/completion/remote.txt @@ -5,6 +5,7 @@ fedora become=sudo provider=aws arch=x86_64 freebsd/13.2 python=3.9,3.11 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64 freebsd python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64 macos/13.2 python=3.11 python_dir=/usr/local/bin become=sudo provider=parallels arch=x86_64 +macos/14.3 python=3.11 python_dir=/usr/local/bin become=sudo provider=parallels arch=x86_64 macos python_dir=/usr/local/bin become=sudo provider=parallels arch=x86_64 rhel/9.3 python=3.9,3.11 become=sudo provider=aws arch=x86_64 rhel become=sudo provider=aws arch=x86_64 |