IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues 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 12:52:16 -06:00 committed by GitHub
parent ceb3d8d295
commit 69ffce4c42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/build/cmd/uploadpackages.go
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")
}

22
pkg/build/packaging/grafana_test.go Normal file
View File

@ -0,0 +1,22 @@
package packaging_test
import (
"testing"
"github.com/grafana/grafana/pkg/build/config"
"github.com/grafana/grafana/pkg/build/packaging"
"github.com/stretchr/testify/assert"
)
func TestPackageRegexp(t *testing.T) {
t.Run("It should match enterprise2 packages", func(t *testing.T) {
rgx := packaging.PackageRegexp(config.EditionEnterprise2)
matches := []string{
"grafana-enterprise2-1.2.3-4567pre.linux-amd64.tar.gz",
"grafana-enterprise2-1.2.3-4567pre.linux-amd64.tar.gz.sha256",
}
for _, v := range matches {
assert.Truef(t, rgx.MatchString(v), "'%s' should match regex '%s'", v, rgx.String())
}
})
}