Run tests with macOS 10.15. (#971) (#1015)

* Run tests with macOS 10.15. * Restrict to macOS CI runs for now until they pass. * Skip tests on macOS that are skipped on OSX. * Disable consul test for macOS. * Disable chroot connection tests for macOS. * Add setup_gnutar role from https://github.com/ansible/ansible/pull/71841. * Use setup_gnutar for yarn and npm tests. * Revert "Restrict to macOS CI runs for now until they pass." This reverts commit d945d0399f. * hashi_vault lookup tests seem to be always unstable, disabling for now. * Use homebrew module instead of command. (cherry picked from commit eba5216be5) Co-authored-by: Felix Fontein <felix@fontein.de>
2024-09-14 20:13:21 +02:00 · 2020-09-30 16:32:08 +02:00 · 2020-09-30 16:32:08 +02:00 · 4dc2e14039
commit 4dc2e14039
parent 6ec769b051
80 changed files with 109 additions and 0 deletions
--- a/shippable.yml
+++ b/shippable.yml
@ -49,6 +49,7 @@ matrix:

    #- env: T=devel/aix/7.2/1
    - env: T=devel/osx/10.11/1
+    - env: T=devel/macos/10.15/1
    - env: T=devel/rhel/7.8/1
    - env: T=devel/rhel/8.2/1
    - env: T=devel/freebsd/11.1/1
@ -65,6 +66,7 @@ matrix:

    #- env: T=devel/aix/7.2/2
    - env: T=devel/osx/10.11/2
+    - env: T=devel/macos/10.15/2
    - env: T=devel/rhel/7.8/2
    - env: T=devel/rhel/8.2/2
    - env: T=devel/freebsd/11.1/2
@ -81,6 +83,7 @@ matrix:

    #- env: T=devel/aix/7.2/3
    - env: T=devel/osx/10.11/3
+    - env: T=devel/macos/10.15/3
    - env: T=devel/rhel/7.8/3
    - env: T=devel/rhel/8.2/3
    - env: T=devel/freebsd/11.1/3
@ -97,6 +100,7 @@ matrix:

    #- env: T=devel/aix/7.2/4
    - env: T=devel/osx/10.11/4
+    - env: T=devel/macos/10.15/4
    - env: T=devel/rhel/7.8/4
    - env: T=devel/rhel/8.2/4
    - env: T=devel/freebsd/11.1/4
@ -113,6 +117,7 @@ matrix:

    #- env: T=devel/aix/7.2/5
    - env: T=devel/osx/10.11/5
+    - env: T=devel/macos/10.15/5
    - env: T=devel/rhel/7.8/5
    - env: T=devel/rhel/8.2/5
    - env: T=devel/freebsd/11.1/5
--- a/tests/integration/targets/alternatives/aliases
+++ b/tests/integration/targets/alternatives/aliases
@ -4,3 +4,4 @@ needs/root
 skip/aix
 skip/freebsd
 skip/osx
+skip/macos
--- a/tests/integration/targets/cloud_init_data_facts/aliases
+++ b/tests/integration/targets/cloud_init_data_facts/aliases
@ -2,4 +2,5 @@ destructive
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
--- a/tests/integration/targets/connection_chroot/aliases
+++ b/tests/integration/targets/connection_chroot/aliases
@ -1,2 +1,3 @@
 needs/root
 shippable/posix/group3
+skip/macos  # FIXME
--- a/tests/integration/targets/consul/aliases
+++ b/tests/integration/targets/consul/aliases
@ -1,3 +1,4 @@
 shippable/posix/group2
 destructive
 skip/aix
+skip/macos  # cannot simply create binaries in system locations on newer macOS versions
--- a/tests/integration/targets/cronvar/aliases
+++ b/tests/integration/targets/cronvar/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/docker_config/aliases
+++ b/tests/integration/targets/docker_config/aliases
@ -1,5 +1,6 @@
 shippable/posix/group3
 skip/osx
+skip/macos
 skip/freebsd
 skip/aix
 destructive
--- a/tests/integration/targets/docker_container/aliases
+++ b/tests/integration/targets/docker_container/aliases
@ -1,5 +1,6 @@
 shippable/posix/group5
 skip/osx
+skip/macos
 skip/freebsd
 skip/aix
 destructive
--- a/tests/integration/targets/docker_container_info/aliases
+++ b/tests/integration/targets/docker_container_info/aliases
@ -1,5 +1,6 @@
 shippable/posix/group2
 skip/osx
+skip/macos
 skip/freebsd
 skip/aix
 destructive
--- a/tests/integration/targets/docker_host_info/aliases
+++ b/tests/integration/targets/docker_host_info/aliases
@ -1,5 +1,6 @@
 shippable/posix/group2
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
--- a/tests/integration/targets/docker_image/aliases
+++ b/tests/integration/targets/docker_image/aliases
@ -1,5 +1,6 @@
 shippable/posix/group5
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
--- a/tests/integration/targets/docker_image_info/aliases
+++ b/tests/integration/targets/docker_image_info/aliases
@ -1,5 +1,6 @@
 shippable/posix/group2
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
--- a/tests/integration/targets/docker_login/aliases
+++ b/tests/integration/targets/docker_login/aliases
@ -1,5 +1,6 @@
 shippable/posix/group3
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
--- a/tests/integration/targets/docker_network/aliases
+++ b/tests/integration/targets/docker_network/aliases
@ -1,5 +1,6 @@
 shippable/posix/group5
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
--- a/tests/integration/targets/docker_network_info/aliases
+++ b/tests/integration/targets/docker_network_info/aliases
@ -1,5 +1,6 @@
 shippable/posix/group2
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
--- a/tests/integration/targets/docker_node/aliases
+++ b/tests/integration/targets/docker_node/aliases
@ -1,6 +1,7 @@
 shippable/posix/group2
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
 skip/docker  # The tests sometimes make docker daemon unstable; hence,
--- a/tests/integration/targets/docker_node_info/aliases
+++ b/tests/integration/targets/docker_node_info/aliases
@ -1,6 +1,7 @@
 shippable/posix/group3
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
 skip/docker  # The tests sometimes make docker daemon unstable; hence,
--- a/tests/integration/targets/docker_prune/aliases
+++ b/tests/integration/targets/docker_prune/aliases
@ -1,5 +1,6 @@
 shippable/posix/group2
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
--- a/tests/integration/targets/docker_secret/aliases
+++ b/tests/integration/targets/docker_secret/aliases
@ -1,6 +1,7 @@
 shippable/posix/group2
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
 skip/docker  # The tests sometimes make docker daemon unstable; hence,
--- a/tests/integration/targets/docker_stack/aliases
+++ b/tests/integration/targets/docker_stack/aliases
@ -1,6 +1,7 @@
 shippable/posix/group2
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
 skip/docker  # The tests sometimes make docker daemon unstable; hence,
--- a/tests/integration/targets/docker_stack_info/aliases
+++ b/tests/integration/targets/docker_stack_info/aliases
@ -1,6 +1,7 @@
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
 skip/docker  # The tests sometimes make docker daemon unstable; hence,
--- a/tests/integration/targets/docker_stack_task_info/aliases
+++ b/tests/integration/targets/docker_stack_task_info/aliases
@ -1,6 +1,7 @@
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
 skip/docker  # The tests sometimes make docker daemon unstable; hence,
--- a/tests/integration/targets/docker_swarm/aliases
+++ b/tests/integration/targets/docker_swarm/aliases
@ -2,6 +2,7 @@ shippable/posix/group2
 disabled  # See: https://github.com/ansible/ansible/issues/61815
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
 skip/docker  # The tests sometimes make docker daemon unstable; hence,
--- a/tests/integration/targets/docker_swarm_info/aliases
+++ b/tests/integration/targets/docker_swarm_info/aliases
@ -1,6 +1,7 @@
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
 skip/docker  # The tests sometimes make docker daemon unstable; hence,
--- a/tests/integration/targets/docker_swarm_service/aliases
+++ b/tests/integration/targets/docker_swarm_service/aliases
@ -1,6 +1,7 @@
 shippable/posix/group5
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
 skip/docker  # The tests sometimes make docker daemon unstable; hence,
--- a/tests/integration/targets/docker_swarm_service_info/aliases
+++ b/tests/integration/targets/docker_swarm_service_info/aliases
@ -1,6 +1,7 @@
 shippable/posix/group3
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
 skip/docker  # The tests sometimes make docker daemon unstable; hence,
--- a/tests/integration/targets/docker_volume/aliases
+++ b/tests/integration/targets/docker_volume/aliases
@ -1,5 +1,6 @@
 shippable/posix/group2
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
--- a/tests/integration/targets/docker_volume_info/aliases
+++ b/tests/integration/targets/docker_volume_info/aliases
@ -1,5 +1,6 @@
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
--- a/tests/integration/targets/dpkg_divert/aliases
+++ b/tests/integration/targets/dpkg_divert/aliases
@ -1,5 +1,6 @@
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
 skip/rhel
 skip/freebsd
--- a/tests/integration/targets/etcd3/aliases
+++ b/tests/integration/targets/etcd3/aliases
@ -2,6 +2,7 @@ shippable/posix/group1
 destructive
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 skip/python2.6 # installing etcd3 python module will fail on python < 2.7
 disabled  # see https://github.com/ansible-collections/community.general/issues/322
--- a/tests/integration/targets/filesystem/aliases
+++ b/tests/integration/targets/filesystem/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group3
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/flatpak/aliases
+++ b/tests/integration/targets/flatpak/aliases
@ -3,6 +3,7 @@ destructive
 skip/aix
 skip/freebsd
 skip/osx
+skip/macos
 skip/rhel
 needs/root
 needs/privileged
--- a/tests/integration/targets/flatpak_remote/aliases
+++ b/tests/integration/targets/flatpak_remote/aliases
@ -3,5 +3,6 @@ destructive
 skip/aix
 skip/freebsd
 skip/osx
+skip/macos
 skip/rhel
 needs/root
--- a/tests/integration/targets/gem/aliases
+++ b/tests/integration/targets/gem/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/influxdb_user/aliases
+++ b/tests/integration/targets/influxdb_user/aliases
@ -2,5 +2,6 @@ destructive
 shippable/posix/group1
 disabled
 skip/osx
+skip/macos
 skip/freebsd
 skip/rhel
--- a/tests/integration/targets/inventory_docker_machine/aliases
+++ b/tests/integration/targets/inventory_docker_machine/aliases
@ -2,6 +2,7 @@ disabled
 shippable/posix/group2
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
 skip/docker  # We need SSH access to the VM and need to be able to let
--- a/tests/integration/targets/inventory_docker_swarm/aliases
+++ b/tests/integration/targets/inventory_docker_swarm/aliases
@ -1,6 +1,7 @@
 shippable/posix/group2
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 destructive
 skip/docker  # The tests sometimes make docker daemon unstable; hence,
--- a/tests/integration/targets/iptables_state/aliases
+++ b/tests/integration/targets/iptables_state/aliases
@ -3,4 +3,5 @@ shippable/posix/group4
 skip/docker             # kernel modules not loadable
 skip/freebsd            # no iptables/netfilter (Linux specific)
 skip/osx                # no iptables/netfilter (Linux specific)
+skip/macos              # no iptables/netfilter (Linux specific)
 skip/aix                # no iptables/netfilter (Linux specific)
--- a/tests/integration/targets/jboss/aliases
+++ b/tests/integration/targets/jboss/aliases
@ -2,6 +2,7 @@ destructive
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 skip/rhel
 needs/root
--- a/tests/integration/targets/ldap_search/aliases
+++ b/tests/integration/targets/ldap_search/aliases
@ -2,5 +2,6 @@ shippable/posix/group1
 skip/aix
 skip/freebsd
 skip/osx
+skip/macos
 skip/rhel
 needs/root
--- a/tests/integration/targets/listen_ports_facts/aliases
+++ b/tests/integration/targets/listen_ports_facts/aliases
@ -2,4 +2,5 @@ shippable/posix/group3
 destructive
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
--- a/tests/integration/targets/lookup_etcd3/aliases
+++ b/tests/integration/targets/lookup_etcd3/aliases
@ -4,6 +4,7 @@ needs/file/tests/utils/constraints.txt
 needs/target/setup_etcd3
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 skip/python2.6  # lookups are controller only, and we no longer support Python 2.6 on the controller
 disabled  # see https://github.com/ansible-collections/community.general/issues/322
--- a/tests/integration/targets/lookup_hashi_vault/aliases
+++ b/tests/integration/targets/lookup_hashi_vault/aliases
@ -4,3 +4,4 @@ needs/target/setup_openssl
 needs/file/tests/utils/constraints.txt
 skip/aix
 skip/python2.6  # lookups are controller only, and we no longer support Python 2.6 on the controller
+skip/macos  # FIXME seems to be always unstable
--- a/tests/integration/targets/lvg/aliases
+++ b/tests/integration/targets/lvg/aliases
@ -4,3 +4,4 @@ shippable/posix/group1
 skip/aix
 skip/freebsd
 skip/osx
+skip/macos
--- a/tests/integration/targets/mqtt/aliases
+++ b/tests/integration/targets/mqtt/aliases
@ -2,5 +2,6 @@ notification/mqtt
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 skip/rhel
--- a/tests/integration/targets/npm/meta/main.yml
+++ b/tests/integration/targets/npm/meta/main.yml
@ -1,2 +1,3 @@
 dependencies:
  - setup_pkg_mgr
+  - setup_gnutar
--- a/tests/integration/targets/odbc/aliases
+++ b/tests/integration/targets/odbc/aliases
@ -1,5 +1,6 @@
 destructive
 shippable/posix/group1
 skip/osx
+skip/macos
 skip/rhel8.0
 skip/freebsd
--- a/tests/integration/targets/postgresql_copy/aliases
+++ b/tests/integration/targets/postgresql_copy/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_db/aliases
+++ b/tests/integration/targets/postgresql_db/aliases
@ -3,3 +3,4 @@ shippable/posix/group4
 postgresql_db
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_ext/aliases
+++ b/tests/integration/targets/postgresql_ext/aliases
@ -2,4 +2,5 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
--- a/tests/integration/targets/postgresql_idx/aliases
+++ b/tests/integration/targets/postgresql_idx/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_info/aliases
+++ b/tests/integration/targets/postgresql_info/aliases
@ -2,5 +2,6 @@ destructive
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 skip/rhel
--- a/tests/integration/targets/postgresql_lang/aliases
+++ b/tests/integration/targets/postgresql_lang/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_membership/aliases
+++ b/tests/integration/targets/postgresql_membership/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_owner/aliases
+++ b/tests/integration/targets/postgresql_owner/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_pg_hba/aliases
+++ b/tests/integration/targets/postgresql_pg_hba/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_ping/aliases
+++ b/tests/integration/targets/postgresql_ping/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_privs/aliases
+++ b/tests/integration/targets/postgresql_privs/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_publication/aliases
+++ b/tests/integration/targets/postgresql_publication/aliases
@ -2,4 +2,5 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
--- a/tests/integration/targets/postgresql_query/aliases
+++ b/tests/integration/targets/postgresql_query/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_schema/aliases
+++ b/tests/integration/targets/postgresql_schema/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_sequence/aliases
+++ b/tests/integration/targets/postgresql_sequence/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_set/aliases
+++ b/tests/integration/targets/postgresql_set/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_slot/aliases
+++ b/tests/integration/targets/postgresql_slot/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_subscription/aliases
+++ b/tests/integration/targets/postgresql_subscription/aliases
@ -2,5 +2,6 @@ destructive
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 skip/rhel
--- a/tests/integration/targets/postgresql_table/aliases
+++ b/tests/integration/targets/postgresql_table/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group5
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_tablespace/aliases
+++ b/tests/integration/targets/postgresql_tablespace/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_user/aliases
+++ b/tests/integration/targets/postgresql_user/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group4
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/postgresql_user_obj_stat_info/aliases
+++ b/tests/integration/targets/postgresql_user_obj_stat_info/aliases
@ -1,6 +1,7 @@
 destructive
 shippable/posix/group1
 skip/osx
+skip/macos
 skip/freebsd
 skip/rhel
 skip/aix
--- a/tests/integration/targets/redis_info/aliases
+++ b/tests/integration/targets/redis_info/aliases
@ -2,4 +2,5 @@ destructive
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
 skip/rhel
--- a/tests/integration/targets/setup_gnutar/handlers/main.yml
+++ b/tests/integration/targets/setup_gnutar/handlers/main.yml
@ -0,0 +1,7 @@
+---
+- name: uninstall gnu-tar
+  community.general.homebrew:
+    name: gnu-tar
+    state: absent
+  become: yes
+  become_user: "{{ brew_stat.stat.pw_name }}"
--- a/tests/integration/targets/setup_gnutar/tasks/main.yml
+++ b/tests/integration/targets/setup_gnutar/tasks/main.yml
@ -0,0 +1,20 @@
+---
+- 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
+
+    - name: MACOS | Install gnu-tar
+      community.general.homebrew:
+        name: gnu-tar
+        state: present
+      become: yes
+      become_user: "{{ brew_stat.stat.pw_name }}"
+      notify:
+        - uninstall gnu-tar
--- a/tests/integration/targets/timezone/aliases
+++ b/tests/integration/targets/timezone/aliases
@ -2,3 +2,4 @@ destructive
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
--- a/tests/integration/targets/ufw/aliases
+++ b/tests/integration/targets/ufw/aliases
@ -1,6 +1,7 @@
 shippable/posix/group2
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
 skip/rhel8.0
 skip/rhel8.0b
--- a/tests/integration/targets/xattr/aliases
+++ b/tests/integration/targets/xattr/aliases
@ -3,4 +3,5 @@ skip/aix
 skip/docker
 skip/freebsd
 skip/osx
+skip/macos
 destructive
--- a/tests/integration/targets/xfs_quota/aliases
+++ b/tests/integration/targets/xfs_quota/aliases
@ -3,4 +3,5 @@ needs/root
 shippable/posix/group1
 skip/aix
 skip/osx
+skip/macos
 skip/freebsd
--- a/tests/integration/targets/yarn/meta/main.yml
+++ b/tests/integration/targets/yarn/meta/main.yml
@ -1,2 +1,3 @@
 dependencies:
  - setup_pkg_mgr
+  - setup_gnutar
--- a/tests/integration/targets/zypper/aliases
+++ b/tests/integration/targets/zypper/aliases
@ -3,4 +3,5 @@ shippable/posix/group1
 skip/aix
 skip/freebsd
 skip/osx
+skip/macos
 skip/rhel
--- a/tests/integration/targets/zypper_repository/aliases
+++ b/tests/integration/targets/zypper_repository/aliases
@ -3,4 +3,5 @@ shippable/posix/group1
 skip/aix
 skip/freebsd
 skip/osx
+skip/macos
 skip/rhel
--- a/tests/utils/shippable/macos.sh
+++ b/tests/utils/shippable/macos.sh
@ -0,0 +1 @@
+remote.sh