opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 16:47:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22773 from cevich/use_preinstalled_rosetta

Browse Source 
Mac PM test: Require pre-installed rosetta
This commit is contained in:
openshift-merge-bot[bot]
2024-05-28 19:06:12 +00:00
committed by GitHub
parent aca5a7b036 74e8f98772
commit 3fb70d3c8f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/cirrus/mac_setup.sh
View File

@ -7,6 +7,14 @@
set -euo pipefail set -euo pipefail
# Confirm rosetta is installed/enabled and working
if ! arch -arch x86_64 /usr/bin/uname -m; then
# This likely means whatever script used to prepare this mac failed
# and/or did not execute `sudo softwareupdate --install-rosetta --agree-to-license`
echo "Rosetta doesn't appear to be installed, or is non-functional."
exit 1
fi
# The otherwise standard `/etc/ci_environment` file cannot be used in this # The otherwise standard `/etc/ci_environment` file cannot be used in this
# context, because the system is shared for multiple tasks. Instead, persist # context, because the system is shared for multiple tasks. Instead, persist
# env. vars required during /subsequent/ testing steps via a "magic" Cirrus-CI # env. vars required during /subsequent/ testing steps via a "magic" Cirrus-CI

8
pkg/machine/e2e/machine_test.go
View File

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"io" "io"
"os" "os"
"os/exec"
"path/filepath" "path/filepath"
"runtime" "runtime"
"strings" "strings"
@ -70,13 +69,6 @@ var _ = BeforeSuite(func() {
if pullError != nil { if pullError != nil {
Fail(fmt.Sprintf("failed to pull wsl disk: %q", pullError)) Fail(fmt.Sprintf("failed to pull wsl disk: %q", pullError))
} }
if testProvider.VMType() == define.AppleHvVirt {
cmd := exec.Command("softwareupdate", "--install-rosetta", "--agree-to-license")
err := cmd.Run()
if err != nil {
Fail(fmt.Sprintf("Command failed with error: %q", err))
}
}
}) })
var _ = SynchronizedAfterSuite(func() {}, func() {}) var _ = SynchronizedAfterSuite(func() {}, func() {})