containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26293 from Luap99/podman-rosetta 

pkg/machine/e2e: skip rosetta test
This commit is contained in:
openshift-merge-bot[bot] 2025-06-06 16:26:40 +00:00 committed by GitHub
parent 2a5c2f35f5 0b8dd90840
commit e8e5dce121
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/machine/e2e/init_test.go
View File

@ -542,6 +542,7 @@ var _ = Describe("podman machine init", func() {
})
It("machine init with rosetta=true", func() {
Skip("rosetta currently hard disabled https://github.com/containers/podman-machine-os/pull/134")
skipIfVmtype(define.QemuVirt, "Test is only for AppleHv")
skipIfVmtype(define.WSLVirt, "Test is only for AppleHv")
skipIfVmtype(define.HyperVVirt, "Test is only for AppleHv")

12
pkg/machine/ignition/ignition.go
View File

@ -530,7 +530,7 @@ func prepareCertFile(fpath string, name string) (File, error) {
const (
systemdSSLConf = "/etc/systemd/system.conf.d/podman-machine-ssl.conf"
envdSSLConf = "/etc/environment.d/podman-machine-ssl.conf"
// envdSSLConf = "/etc/environment.d/podman-machine-ssl.conf"
profileSSLConf = "/etc/profile.d/podman-machine-ssl.sh"
sslCertFile = "SSL_CERT_FILE"
sslCertDir = "SSL_CERT_DIR"
@ -538,7 +538,7 @@ const (
func getSSLEnvironmentFiles(sslFileName, sslDirName string) []File {
systemdFileContent := "[Manager]\n"
envdFileContent := ""
// envdFileContent := ""
profileFileContent := ""
if sslFileName != "" {
// certs are written to UserCertsTargetPath see prepareCertFile()
@ -546,19 +546,21 @@ func getSSLEnvironmentFiles(sslFileName, sslDirName string) []File {
// a path on the client (i.e. windows) but then join to linux path that will be used inside the VM.
env := fmt.Sprintf("%s=%q\n", sslCertFile, path.Join(define.UserCertsTargetPath, filepath.Base(sslFileName)))
systemdFileContent += "DefaultEnvironment=" + env
envdFileContent += env
// envdFileContent += env
profileFileContent += "export " + env
}
if sslDirName != "" {
// certs are written to UserCertsTargetPath see prepareCertFile()
env := fmt.Sprintf("%s=%q\n", sslCertDir, define.UserCertsTargetPath)
systemdFileContent += "DefaultEnvironment=" + env
envdFileContent += env
// envdFileContent += env
profileFileContent += "export " + env
}
return []File{
getSSLFile(systemdSSLConf, systemdFileContent),
getSSLFile(envdSSLConf, envdFileContent),
// FIXME: something is very broken with the environment.d systemd generator.
// When setting any var there the systemd fails to boot successfully.
// getSSLFile(envdSSLConf, envdFileContent),
getSSLFile(profileSSLConf, profileFileContent),
}
}