Merge pull request #1393 from upsj/overlay_build_error
Return error code if overlay build fails
This commit is contained in:
@@ -39,6 +39,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|||||||
`/sys/firmware/devicetree/base/serial-number`
|
`/sys/firmware/devicetree/base/serial-number`
|
||||||
- Replace slice in templates with sprig substr. #1093
|
- Replace slice in templates with sprig substr. #1093
|
||||||
- Fix an invalid format issue for the GitHub nightly build action. #1258
|
- Fix an invalid format issue for the GitHub nightly build action. #1258
|
||||||
|
- Return non-zero exit code on overlay build failure #1393
|
||||||
|
|
||||||
## v4.5.8, unreleased
|
## v4.5.8, unreleased
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package build
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -77,7 +78,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
|
|||||||
if BuildHost && controller.Warewulf.EnableHostOverlay {
|
if BuildHost && controller.Warewulf.EnableHostOverlay {
|
||||||
err := overlay.BuildHostOverlay()
|
err := overlay.BuildHostOverlay()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
wwlog.Warn("host overlay could not be built: %s", err)
|
return fmt.Errorf("host overlay could not be built: %s", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -89,7 +90,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
wwlog.Warn("Some overlays failed to be generated: %s", err)
|
return fmt.Errorf("Some overlays failed to be generated: %s", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
Reference in New Issue
Block a user