From dc4feb7943de2470b04cd6dd48fcabc3cd90abbf Mon Sep 17 00:00:00 2001 From: Daniel Villanueva Date: Fri, 10 Jan 2025 11:11:40 +0100 Subject: [PATCH] test(e2e): crc-extension e2e tests runner for mac Signed-off-by: Daniel Villanueva --- .github/workflows/pr-check.yaml | 48 +++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml index c410709..d3b8351 100644 --- a/.github/workflows/pr-check.yaml +++ b/.github/workflows/pr-check.yaml @@ -124,7 +124,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022, ubuntu-24.04] #, macos-14 + os: [windows-2022, ubuntu-24.04, macos-15] runs-on: ${{ matrix.os }} env: SKIP_INSTALLATION: true @@ -168,12 +168,50 @@ jobs: working-directory: ./sso-extension run: pnpm install + - name: Install vfkit + if: matrix.os == 'macos-15' + run: | + brew install cfergeau/crc/vfkit + vfkit --version + + - name: Install Podman on macOS + if: matrix.os == 'macos-15' + run: | + ARCH=$(uname -m) + # echo "LATEST_RELEASE => ${LATEST_RELEASE}" + # echo "DOWNLOAD ADDRESS => https://github.com/containers/podman/releases/download/${LATEST_RELEASE}/podman-installer-macos-${ARCH}.pkg" + echo "DOWNLOAD ADDRESS V2 => https://github.com/containers/podman/releases/latest/download/podman-installer-macos-${ARCH}.pkg" + echo "CURL COMMAND =>" + # curl -LO -o ./podman-installer-macos-${ARCH}.pkg https://github.com/containers/podman/releases/download/${LATEST_RELEASE}/podman-installer-macos-${ARCH}.pkg + curl -LO https://github.com/containers/podman/releases/latest/download/podman-installer-macos-${ARCH}.pkg + + echo "INSTALL PACKAGED INSTALLER =>" + sudo installer -pkg podman-installer-macos-${ARCH}.pkg -target / + echo "ADD PODMAN DIRECTORY (/opt/podman/bin/podman) TO PATH =>" + # PODMAN_PATH_FULL=$(which podman) + # PODMAN_PATH=$(dirname $(which podman)) + # echo "PODMAN PATH (dirname(which podman)) => ${PODMAN_PATH} (FULL=${PODMAN_PATH_FULL})" + # echo "${PODMAN_PATH}" | sudo tee /etc/paths.d/podman_path + echo "PATH=/opt/podman/bin:$PATH" >> $GITHUB_ENV + + - name: Setup Podman machine on macOS + if: matrix.os == 'macos-15' + run: | + echo "START PODMAN MACHINE=>" + podman --version + # yes | podman machine reset + podman machine init + podman machine list + podman machine info + podman machine inspect + podman machine start --log-level debug + - name: Build Podman Desktop for E2E tests working-directory: ./podman-desktop run: pnpm test:e2e:build - - name: Ensure getting current HEAD version of the test framework (ubuntu) - if: matrix.os == 'ubuntu-24.04' + - name: Ensure getting current HEAD version of the test framework (Ubuntu/MacOS) + if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-15' working-directory: ./crc-extension run: | # workaround for https://github.com/containers/podman-desktop-extension-bootc/issues/712 @@ -215,8 +253,8 @@ jobs: # allow unprivileged user namespace sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 - - name: Build OpenShift Local extension from container file and SSO dependency (Ubuntu, podman) - if: matrix.os == 'ubuntu-24.04' + - name: Build OpenShift Local extension from container file and SSO dependency (Ubuntu/MacOS, podman) + if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-15' working-directory: ./crc-extension run: | # build crc extension