Merge pull request #22890 from cevich/v5.1_cp_22773

[v5.1] Mac PM test: Require pre-installed rosetta

contrib/cirrus/mac_setup.sh

@@ -7,6 +7,14 @@
 
 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
 # context, because the system is shared for multiple tasks.  Instead, persist
 # env. vars required during /subsequent/ testing steps via a "magic" Cirrus-CI

pkg/machine/e2e/machine_test.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"runtime"
 	"testing"
@@ -63,13 +62,6 @@ var _ = BeforeSuite(func() {
 	if pullError != nil {
 		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() {})