[v9.3.x] Build: Add CloudMode to build versions (#65988)

Build: Add CloudMode to build versions (#65651)

* Add CloudMode to build versions

* Use linux-amd64 variant without musl for cloud mode

* Add cloud mode to version folder on package upload

* Use musl variant for CloudMode

* Only sign rpm packages if there's any to sign

* Remove trailing whitespace

(cherry picked from commit 8f282b8a6e)

Co-authored-by: Guilherme Caulada <guilherme.caulada@grafana.com>
This commit is contained in:
Grot (@grafanabot)
2023-04-05 03:38:14 -05:00
committed by GitHub
parent c9882623f5
commit 1d0c19ff5c
5 changed files with 55 additions and 22 deletions
+1 -1
View File
@@ -144,7 +144,7 @@ func getVersionFolder(cfg uploadConfig, event string) (string, error) {
return releaseFolder, nil
case config.MainMode, config.DownstreamMode:
return mainFolder, nil
case config.ReleaseBranchMode:
case config.ReleaseBranchMode, config.CloudMode:
return releaseBranchFolder, nil
default:
// Corner case for custom enterprise2 mode
+3
View File
@@ -123,6 +123,7 @@ func CheckDroneTargetBranch() (VersionMode, error) {
func CheckSemverSuffix() (ReleaseMode, error) {
reBetaRls := regexp.MustCompile(`beta.*`)
reTestRls := regexp.MustCompile(`test.*`)
reCloudRls := regexp.MustCompile(`cloud.*`)
tagSuffix, ok := os.LookupEnv("DRONE_SEMVER_PRERELEASE")
if !ok || tagSuffix == "" {
fmt.Println("DRONE_SEMVER_PRERELEASE doesn't exist for a tag, this is a release event...")
@@ -133,6 +134,8 @@ func CheckSemverSuffix() (ReleaseMode, error) {
return ReleaseMode{Mode: TagMode, IsBeta: true}, nil
case reTestRls.MatchString(tagSuffix):
return ReleaseMode{Mode: TagMode, IsTest: true}, nil
case reCloudRls.MatchString(tagSuffix):
return ReleaseMode{Mode: CloudMode}, nil
default:
fmt.Printf("DRONE_SEMVER_PRERELEASE is custom string, release event with %s suffix\n", tagSuffix)
return ReleaseMode{Mode: TagMode}, nil
+1
View File
@@ -11,6 +11,7 @@ const (
DownstreamMode VersionMode = "downstream"
Enterprise2Mode VersionMode = "enterprise2"
CronjobMode VersionMode = "cron"
CloudMode VersionMode = "cloud"
)
const (
+27
View File
@@ -204,4 +204,31 @@ var Versions = VersionMap{
StorybookSrcDir: "artifacts/storybook",
},
},
CloudMode: {
Variants: []Variant{
VariantLinuxAmd64Musl,
},
PluginSignature: PluginSignature{
Sign: true,
AdminSign: true,
},
Docker: Docker{
ShouldSave: true,
Architectures: []Architecture{
ArchAMD64,
},
Distribution: []Distribution{
Alpine,
},
PrereleaseBucket: "grafana-prerelease/artifacts/docker",
},
Buckets: Buckets{
Artifacts: "grafana-prerelease/artifacts/downloads",
ArtifactsEnterprise2: "grafana-prerelease/artifacts/downloads-enterprise2",
CDNAssets: "grafana-prerelease",
CDNAssetsDir: "artifacts/static-assets",
Storybook: "grafana-prerelease",
StorybookSrcDir: "artifacts/storybook",
},
},
}
+2
View File
@@ -184,6 +184,7 @@ func signRPMPackages(edition config.Edition, cfg config.Config, grafanaDir strin
return err
}
if len(rpms) > 0 {
rpmArgs := append([]string{"--addsign"}, rpms...)
log.Printf("Invoking rpm with args: %+v", rpmArgs)
//nolint:gosec
@@ -210,6 +211,7 @@ func signRPMPackages(edition config.Edition, cfg config.Config, grafanaDir strin
return fmt.Errorf("RPM package %q not verified: %s", p, output)
}
}
}
return nil
}