Skip to content

Commit

Permalink
have portage use the provided gatecheck config rather than the copied…
Browse files Browse the repository at this point in the history
… over config in the /artifacts directory
  • Loading branch information
ayee808 committed Dec 10, 2024
1 parent 13e065d commit fbf86d2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
7 changes: 6 additions & 1 deletion pkg/pipelines/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,17 @@ func (p *Deploy) Run() error {
}

if p.config.Deploy.Submit {
configPath := gatecheckConfigPath
if p.config.Deploy.GatecheckConfigFilename != "" {
configPath = p.config.Deploy.GatecheckConfigFilename
}

err = shell.GatecheckSubmit(
shell.WithDryRun(p.DryRunEnabled),
shell.WithStderr(p.Stderr),
shell.WithStdout(p.Stdout),
shell.WithTargetFile(p.runtime.bundleFilename),
shell.WithConfigFile(gatecheckConfigPath),
shell.WithConfigFile(configPath),
)
if err != nil {
return mkDeploymentError(err)
Expand Down
3 changes: 2 additions & 1 deletion pkg/shell/gatecheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ func GatecheckValidate(options ...OptionFunc) error {

func GatecheckSubmit(options ...OptionFunc) error {
o := newOptions(options...)
cmd := exec.Command("gatecheck", "submit", "--config", o.configFilename, o.targetFilename)
// TODO: remove verbose once we are at MVP
cmd := exec.Command("gatecheck", "submit", "--config", o.configFilename, o.targetFilename, "--verbose")
return run(cmd, o)
}

0 comments on commit fbf86d2

Please sign in to comment.