Skip to content

MGMT-23709: Clean up temp directories after building ISOs #680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zaneb wants to merge 3 commits into
base: master
Choose a base branch
from
Open

MGMT-23709: Clean up temp directories after building ISOs #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8493f8
Add --preserve-temp-dirs flag for debugging ISO builds
zaneb Mar 30, 2026
90904d2
Clean up live ISO work directory after build
zaneb Mar 29, 2026
d1c2c11
Clean up data staging directory after ISO creation
zaneb Mar 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmd/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ var (
debugBootstrap bool
debugBaseIgnition bool
isLiveISO bool
preserveTempDirs bool
}

envConfig config.EnvConfig
Expand All @@ -42,6 +43,7 @@ func NewBuildCmd() *cobra.Command {
cmd.AddCommand(getBuildLiveISOCmd())
cmd.PersistentFlags().BoolVar(&buildOpts.debugBootstrap, "debug-bootstrap", false, "")
cmd.PersistentFlags().BoolVar(&buildOpts.debugBaseIgnition, "debug-base-ignition", false, "")
cmd.PersistentFlags().BoolVar(&buildOpts.preserveTempDirs, "preserve-temp-dirs", false, "Preserve temporary directories for debugging")
if err := cmd.PersistentFlags().MarkHidden("debug-bootstrap"); err != nil {
logrus.Fatal(err)
}
Expand Down Expand Up @@ -233,6 +235,7 @@ func preRunBuild(cmd *cobra.Command, args []string) {
DebugBootstrap: buildOpts.debugBootstrap,
DebugBaseIgnition: buildOpts.debugBaseIgnition,
IsLiveISO: buildOpts.isLiveISO,
PreserveTempDirs: buildOpts.preserveTempDirs,
}

// Generate EnvConfig asset
Expand Down
9 changes: 9 additions & 0 deletions pkg/asset/appliance/appliance_liveiso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,15 @@ func (a *ApplianceLiveISO) buildLiveISO(
logrus.Errorf("Error creating isohybrid: %s", err)
}

// Clean up work directory now that appliance.iso has been created
Comment thread
zaneb marked this conversation as resolved.
if envConfig.PreserveTempDirs {
logrus.Infof("Preserving work directory for debugging: %s", workDir)
} else {
if err = os.RemoveAll(workDir); err != nil {
logrus.Warnf("Failed to clean up work directory %s: %v", workDir, err)
}
}

return log.StopSpinner(spinner, nil)
}

Expand Down
1 change: 1 addition & 0 deletions pkg/asset/config/env_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ type EnvConfig struct {

DebugBootstrap bool
DebugBaseIgnition bool
PreserveTempDirs bool
}

var _ asset.Asset = (*EnvConfig)(nil)
Expand Down
8 changes: 8 additions & 0 deletions pkg/asset/data/data_iso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,14 @@ func (a *DataISO) Generate(dependencies asset.Parents) error {
if err = imageGen.GenerateImage(envConfig.CacheDir, dataIsoName, filepath.Join(envConfig.TempDir, dataDir), dataVolumeName); err != nil {
return log.StopSpinner(spinner, err)
}
// Clean up staging directory now that data.iso has been created
if envConfig.PreserveTempDirs {
logrus.Infof("Preserving staging directory for debugging: %s", dataDirPath)
} else {
if err = os.RemoveAll(dataDirPath); err != nil {
logrus.Warnf("Failed to clean up staging directory %s: %v", dataDirPath, err)
}
}
return log.StopSpinner(spinner, a.updateAsset(envConfig))
}

Expand Down