From 43ed19e370737e89194ee76d36716ba3f3cd9d8a Mon Sep 17 00:00:00 2001
From: Brian Scholer <1260690+briantist@users.noreply.github.com>
Date: Sun, 18 Dec 2022 12:59:20 -0500
Subject: [PATCH] Remove MacOS Local Integration tests from CI (#337)

* macos fix?

* temporarily disable integration

* weong syntax

* move python to controller config

* macos-a213

* remove macos LI tests

* remove macos-docker action
---
 .github/actions/macos-docker/action.yml | 23 -----------------------
 .github/workflows/ansible-test.yml      | 24 ++----------------------
 2 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 .github/actions/macos-docker/action.yml

diff --git a/.github/actions/macos-docker/action.yml b/.github/actions/macos-docker/action.yml
deleted file mode 100644
index 70833113a..000000000
--- a/.github/actions/macos-docker/action.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: Install Docker on MacOS GitHub Runner
-description: Install and configure docker for a MacOS GitHub runner, and export the environment variables.
-branding:
-  icon: command
-  color: white
-runs:
-  using: composite
-  steps:
-    - shell: bash
-      run: |
-        mkdir -p ~/.docker/machine/cache
-        curl -Lo ~/.docker/machine/cache/boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v19.03.12/boot2docker.iso
-
-        sudo mkdir -p /etc/vbox
-        sudo chown -R $(whoami) /etc/vbox
-        sudo echo '* 0.0.0.0/0 ::/0' > /etc/vbox/networks.conf
-
-        brew install docker-machine docker
-        docker --version
-        docker-machine create --driver virtualbox default
-        docker-machine env default
-        docker-machine env default | sed 's/^export //;/^#/d;s/^#.*//' | tr -d '"' >> $GITHUB_ENV
diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml
index c17e80403..8eac2e64b 100644
--- a/.github/workflows/ansible-test.yml
+++ b/.github/workflows/ansible-test.yml
@@ -296,31 +296,18 @@ jobs:
   local_test_invocation:
     runs-on: ${{ matrix.runner }}
     name: LI - ${{ matrix.runner }} (Ⓐ${{ matrix.ansible }}+py${{ matrix.python }})
-    env:
-      # needed to prevent Ansible crashing on MacOS
-      OBJC_DISABLE_INITIALIZE_FORK_SAFETY: 'YES'
     strategy:
       fail-fast: false
       matrix:
         ansible:
-          - stable-2.12
           - stable-2.14
+          - devel
         python:
           - 3.9
         runner:
           - ubuntu-latest
-          - macos-12
         test_container:
           - default
-        exclude:
-          # To add to the fragility of testing docker stuff on MacOS,
-          # stable-2.13+ test containers crash; unsure of exact cause
-          # but likely due to old versions of the runtimes.
-          # We'll just stick to 2.12 for now, better than nothing.
-          - runner: macos-12
-            ansible: stable-2.14
-          - runner: ubuntu-latest
-            ansible: stable-2.12
 
     steps:
       - name: Initialize env vars
@@ -330,7 +317,7 @@ jobs:
             COLLECTION_PATH=ansible_collections/${NAMESPACE}/${COLLECTION_NAME}
             COLLECTION_INTEGRATION_PATH=${COLLECTION_PATH}/tests/integration
             COLLECTION_INTEGRATION_TARGETS=${COLLECTION_INTEGRATION_PATH}/targets
-            DOCKER_TEST_INVOCATION="integration -v --color --retry-on-error --continue-on-error --python ${{ matrix.python }} --docker ${{ matrix.test_container }} ${{ github.event_name != 'schedule' && '--coverage' || '' }}"
+            DOCKER_TEST_INVOCATION="integration -v --color --retry-on-error --continue-on-error --controller docker:${{ matrix.test_container }},python=${{ matrix.python }} ${{ github.event_name != 'schedule' && '--coverage' || '' }}"
 
       - name: Check out code
         uses: actions/checkout@v3
@@ -358,12 +345,6 @@ jobs:
         with:
           collection: community.docker
 
-      - name: Install Docker on MacOS
-        if: ${{ startsWith(matrix.runner, 'macos') }}
-        timeout-minutes: 6
-        # sometimes this hangs forever waiting for an IP
-        uses: ./.github/actions/macos-docker
-
       - name: Pull Ansible test images
         timeout-minutes: 5
         continue-on-error: true
@@ -391,7 +372,6 @@ jobs:
 
       #TODO add capability in the Ansible side once vault_list and vault_delete exist
       - name: Run a third time, but delete Vault's cubbyhole contents first
-        if: startsWith(matrix.runner, 'ubuntu')
         working-directory: ${{ env.COLLECTION_PATH }}
         env:
           VAULT_TOKEN: 47542cbc-6bf8-4fba-8eda-02e0a0d29a0a