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

Grafana Cloud: Put cloud artifacts to */release dir (#66168)

Browse Source 
Put cloud artifacts to */release dir
This commit is contained in:
Dimitris Sotirakis 2023-04-10 10:05:18 +03:00 committed by GitHub
parent 8dd87a79f7
commit a2634495e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/build/cmd/uploadpackages.go
View File

@ -141,11 +141,11 @@ func bucketForEnterprise2(releaseModeConfig *config.BuildConfig, event string) (
func getVersionFolder(cfg uploadConfig, event string) (string, error) {
switch cfg.versionMode {
case config.TagMode:
case config.TagMode, config.CloudMode:
return releaseFolder, nil
case config.MainMode, config.DownstreamMode:
return mainFolder, nil
case config.ReleaseBranchMode, config.CloudMode:
case config.ReleaseBranchMode:
return releaseBranchFolder, nil
default:
// Corner case for custom enterprise2 mode

1
pkg/build/cmd/uploadpackages_test.go
View File

@ -27,6 +27,7 @@ func Test_getVersionFolder(t *testing.T) {
{"downstream mode", args{uploadConfig{versionMode: config.DownstreamMode}, "", mainFolder}, nil},
{"release branch mode", args{uploadConfig{versionMode: config.ReleaseBranchMode}, "", releaseBranchFolder}, nil},
{"enterprise pro mode", args{uploadConfig{versionMode: config.Enterprise2Mode}, config.Custom, releaseFolder}, nil},
{"cloud mode", args{uploadConfig{versionMode: config.CloudMode}, "", releaseFolder}, nil},
{"unrecognised version mode", args{uploadConfig{versionMode: "foo"}, config.Custom, ""}, errors.New("")},
}
for _, tt := range tests {