public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: add a quick test, set enterprise2 when the enterprise2 flag is added (#59967)

Browse Source 
* add a quick test, set enterprise2 when the enterprise2 flag is added

Co-authored-by: Dave Henderson <dave.henderson@grafana.com>
This commit is contained in:
Kevin Minehart
2022-12-07 13:52:16 -05:00
committed by GitHub
co-authored by Dave Henderson
parent ceb3d8d295
commit 69ffce4c42
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/build/cmd/uploadpackages.go
+14 -6
View File
@@ -69,9 +69,17 @@ func UploadPackages(c *cli.Context) error {
return cli.NewExitError(err.Error(), 1)
}
edition, ok := os.LookupEnv("EDITION")
if !ok {
return fmt.Errorf("EDITION envvar is missing, exitting")
var edition config.Edition
if e, ok := os.LookupEnv("EDITION"); ok {
edition = config.Edition(e)
}
if c.Bool("enterprise2") {
edition = config.EditionEnterprise2
}
if edition == "" {
return fmt.Errorf("both EDITION envvar and '--enterprise2' flag are missing. At least one of those is required")
}
// TODO: Verify config values
@@ -80,15 +88,15 @@ func UploadPackages(c *cli.Context) error {
Version: version,
Bucket: releaseModeConfig.Buckets.Artifacts,
},
edition: config.Edition(edition),
edition: edition,
versionMode: releaseMode.Mode,
gcpKey: gcpKey,
distDir: distDir,
}
if cfg.edition == config.EditionEnterprise2 || c.Bool("enterprise2") {
if cfg.edition == config.EditionEnterprise2 {
if releaseModeConfig.Buckets.ArtifactsEnterprise2 != "" {
cfg.Config.Bucket = releaseModeConfig.Buckets.ArtifactsEnterprise2
cfg.Bucket = releaseModeConfig.Buckets.ArtifactsEnterprise2
} else {
return fmt.Errorf("enterprise2 bucket var doesn't exist")
}