From e7a7cda3bcadb9104b240d15a800850a4454b8bc Mon Sep 17 00:00:00 2001 From: Lukas Zapletal Date: Tue, 26 Nov 2024 15:24:21 +0100 Subject: [PATCH] cmd: extra env logging for osbuild worker --- cmd/osbuild-worker/jobimpl-osbuild.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/osbuild-worker/jobimpl-osbuild.go b/cmd/osbuild-worker/jobimpl-osbuild.go index d5d24a7f2b..4b509702dd 100644 --- a/cmd/osbuild-worker/jobimpl-osbuild.go +++ b/cmd/osbuild-worker/jobimpl-osbuild.go @@ -518,6 +518,9 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error { // Both curl and ostree input share the same MTLS config if impl.RepositoryMTLSConfig != nil { + // Setting a CA cert with hosted Pulp with break the build since Pulp redirects HTTPS requests to AWS S3 which has + // a different CA which is part of OS cert bundle. Both curl and ostree commands only support either explicit CA file + // or OS cert bundle, but not both. To verify hosted Pulp CA, enroll its CA into the OS cert bundle instead. if impl.RepositoryMTLSConfig.CA != "" { extraEnv = append(extraEnv, fmt.Sprintf("OSBUILD_SOURCES_CURL_SSL_CA_CERT=%s", impl.RepositoryMTLSConfig.CA)) extraEnv = append(extraEnv, fmt.Sprintf("OSBUILD_SOURCES_OSTREE_SSL_CA_CERT=%s", impl.RepositoryMTLSConfig.CA)) @@ -560,6 +563,7 @@ func (impl *OSBuildJobImpl) Run(job worker.Job) error { exportPaths = append(exportPaths, path.Join(jobTarget.OsbuildArtifact.ExportName, jobTarget.OsbuildArtifact.ExportFilename)) } + logWithId.Infof("Extra env: %q", extraEnv) opts := &osbuildexecutor.OsbuildOpts{ StoreDir: impl.Store, OutputDir: outputDirectory,