From fa4abdcce16f5f56557c5369800594c2ec27eabf Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Thu, 11 Aug 2022 11:44:59 +0300 Subject: [PATCH] Grafana Build: Sync Grafana versioning changes from `build-pipeline` (#53522) * Sync version changes (cherry picked from commit fb449ba0376cd7d86928e8b08ef77a851488604b) Sync version refactoring changes * Update grabpl --- .drone.yml | 80 +++++++++++++-------------- pkg/build/cmd/buildbackend.go | 4 +- pkg/build/cmd/builddocker.go | 2 +- pkg/build/cmd/buildinternalplugins.go | 2 +- pkg/build/config/version.go | 24 +++++--- pkg/build/config/version_mode.go | 4 +- pkg/build/config/version_test.go | 28 +++++----- pkg/build/config/versions.go | 62 +-------------------- scripts/drone/steps/lib.star | 2 +- 9 files changed, 78 insertions(+), 130 deletions(-) diff --git a/.drone.yml b/.drone.yml index b58ed5c8cc2..31b5fa5bf37 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -62,7 +62,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -147,7 +147,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -257,7 +257,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -526,7 +526,7 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -629,7 +629,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -728,7 +728,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -832,7 +832,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -914,7 +914,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -1024,7 +1024,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -1461,7 +1461,7 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -1565,7 +1565,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: windows-init @@ -1661,7 +1661,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -1773,7 +1773,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -2083,7 +2083,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -2228,7 +2228,7 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -2324,7 +2324,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: windows-init @@ -2383,7 +2383,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -2742,7 +2742,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -2933,7 +2933,7 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3075,7 +3075,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -3152,7 +3152,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3232,7 +3232,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3295,7 +3295,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3376,7 +3376,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3440,7 +3440,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3480,7 +3480,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3520,7 +3520,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3580,7 +3580,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3635,7 +3635,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3687,7 +3687,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -3725,7 +3725,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -4006,7 +4006,7 @@ steps: name: identify-runner - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -4145,7 +4145,7 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -4235,7 +4235,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/windows/grabpl.exe -OutFile grabpl.exe image: grafana/ci-wix:0.1.1 name: windows-init @@ -4283,7 +4283,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -4632,7 +4632,7 @@ services: [] steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -4814,7 +4814,7 @@ services: steps: - commands: - mkdir -p bin - - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/grabpl + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/grabpl - chmod +x bin/grabpl image: byrnedo/alpine-curl:0.1.8 name: grabpl @@ -4947,7 +4947,7 @@ steps: name: identify-runner - commands: - $$ProgressPreference = "SilentlyContinue" - - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.1/windows/grabpl.exe + - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.2/windows/grabpl.exe -OutFile grabpl.exe - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - cd grafana-enterprise @@ -5152,6 +5152,6 @@ kind: secret name: gcp_upload_artifacts_key --- kind: signature -hmac: eac88e68cfaee99bc5569b7af5d8c7ebeeac691e5ea3b9f3b9b18e4327d87b21 +hmac: 98f819899607b53f5e6899ec67302671054808a98db9c6fa373e9420d7adeea8 ... diff --git a/pkg/build/cmd/buildbackend.go b/pkg/build/cmd/buildbackend.go index ca3e7466962..e2b9b2e67f3 100644 --- a/pkg/build/cmd/buildbackend.go +++ b/pkg/build/cmd/buildbackend.go @@ -37,9 +37,9 @@ func BuildBackend(ctx *cli.Context) error { } ) - mode, err := config.GetVersion(metadata.ReleaseMode) + mode, err := config.GetVersion(metadata.ReleaseMode.Mode) if err != nil { - return fmt.Errorf("could not get version / package info for mode '%s': %w", metadata.ReleaseMode, err) + return fmt.Errorf("could not get version / package info for mode '%s': %w", metadata.ReleaseMode.Mode, err) } const grafanaDir = "." diff --git a/pkg/build/cmd/builddocker.go b/pkg/build/cmd/builddocker.go index cf1f6f2c411..34d3f3b4862 100644 --- a/pkg/build/cmd/builddocker.go +++ b/pkg/build/cmd/builddocker.go @@ -21,7 +21,7 @@ func BuildDocker(c *cli.Context) error { } useUbuntu := c.Bool("ubuntu") - verMode, err := config.GetVersion(metadata.ReleaseMode) + verMode, err := config.GetVersion(metadata.ReleaseMode.Mode) if err != nil { return err } diff --git a/pkg/build/cmd/buildinternalplugins.go b/pkg/build/cmd/buildinternalplugins.go index 66429f5618c..20788a86f05 100644 --- a/pkg/build/cmd/buildinternalplugins.go +++ b/pkg/build/cmd/buildinternalplugins.go @@ -22,7 +22,7 @@ func BuildInternalPlugins(c *cli.Context) error { if err != nil { return err } - verMode, err := config.GetVersion(metadata.ReleaseMode) + verMode, err := config.GetVersion(metadata.ReleaseMode.Mode) if err != nil { return err } diff --git a/pkg/build/config/version.go b/pkg/build/config/version.go index b13a7da7d95..300056fd5dd 100644 --- a/pkg/build/config/version.go +++ b/pkg/build/config/version.go @@ -14,10 +14,16 @@ import ( type Metadata struct { GrafanaVersion string `json:"version,omitempty"` - ReleaseMode VersionMode `json:"releaseMode,omitempty"` + ReleaseMode ReleaseMode `json:"releaseMode,omitempty"` GrabplVersion string `json:"grabplVersion,omitempty"` } +type ReleaseMode struct { + Mode VersionMode `json:"mode,omitempty"` + IsBeta bool `json:"isBeta,omitempty"` + IsTest bool `json:"isTest,omitempty"` +} + type PluginSignature struct { Sign bool `json:"sign,omitempty"` AdminSign bool `json:"adminSign,omitempty"` @@ -41,13 +47,17 @@ type Version struct { StorybookSrcDir string `json:"storybookSrcDir,omitempty"` } +func (md *Metadata) GetReleaseMode() (ReleaseMode, error) { + return md.ReleaseMode, nil +} + // Versions is a map of versions. Each key of the Versions map is an event that uses the the config as the value for that key. // For example, the 'pull_request' key will have data in it that might cause Grafana to be built differently in a pull request, // than the way it will be built in 'main' type VersionMap map[VersionMode]Version // GetMetadata attempts to read the JSON file located at 'path' and decode it as a Metadata{} type. -// If the provided path deos not exist, then an error is not returned. Instead, an empty metadata is returned with no error. +// If the provided path does not exist, then an error is not returned. Instead, an empty metadata is returned with no error. func GetMetadata(path string) (*Metadata, error) { if _, err := os.Stat(path); err != nil { if errors.Is(err, os.ErrNotExist) { @@ -142,21 +152,21 @@ func CheckDroneTargetBranch() (VersionMode, error) { return "", fmt.Errorf("unrecognized target branch: %s", target) } -func CheckSemverSuffix() (VersionMode, error) { +func CheckSemverSuffix() (ReleaseMode, error) { reBetaRls := regexp.MustCompile(`beta.*`) reTestRls := regexp.MustCompile(`test.*`) 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...") - return ReleaseMode, nil + return ReleaseMode{Mode: TagMode}, nil } switch { case reBetaRls.MatchString(tagSuffix): - return BetaReleaseMode, nil + return ReleaseMode{Mode: TagMode, IsBeta: true}, nil case reTestRls.MatchString(tagSuffix): - return TestReleaseMode, nil + return ReleaseMode{Mode: TagMode, IsTest: true}, nil default: fmt.Printf("DRONE_SEMVER_PRERELEASE is custom string, release event with %s suffix\n", tagSuffix) - return ReleaseMode, nil + return ReleaseMode{Mode: TagMode}, nil } } diff --git a/pkg/build/config/version_mode.go b/pkg/build/config/version_mode.go index 9bda62a4669..0e8f2232812 100644 --- a/pkg/build/config/version_mode.go +++ b/pkg/build/config/version_mode.go @@ -5,9 +5,7 @@ type VersionMode string const ( MainMode VersionMode = "main" - ReleaseMode VersionMode = "release" - BetaReleaseMode VersionMode = "beta" - TestReleaseMode VersionMode = "test" + TagMode VersionMode = "release" ReleaseBranchMode VersionMode = "branch" PullRequestMode VersionMode = "pull_request" ) diff --git a/pkg/build/config/version_test.go b/pkg/build/config/version_test.go index 955a140aa04..1307e2ae27a 100644 --- a/pkg/build/config/version_test.go +++ b/pkg/build/config/version_test.go @@ -13,14 +13,14 @@ import ( func TestGetMetadata(t *testing.T) { tcs := []struct { version string - mode config.VersionMode + mode config.ReleaseMode }{ - {"v1.2.3", config.ReleaseMode}, - {"v1.2.3-12345pre", config.PullRequestMode}, - {"v1.2.3-beta1", config.BetaReleaseMode}, - {"v1.2.3-test1", config.TestReleaseMode}, - {"v1.2.3-foobar", config.ReleaseBranchMode}, - {"v1.2.3-foobar", config.MainMode}, + {"v1.2.3", config.ReleaseMode{Mode: config.TagMode}}, + {"v1.2.3-12345pre", config.ReleaseMode{Mode: config.PullRequestMode}}, + {"v1.2.3-beta1", config.ReleaseMode{Mode: config.TagMode, IsBeta: true}}, + {"v1.2.3-test1", config.ReleaseMode{Mode: config.TagMode, IsTest: true}}, + {"v1.2.3-foobar", config.ReleaseMode{Mode: config.ReleaseBranchMode}}, + {"v1.2.3-foobar", config.ReleaseMode{Mode: config.PullRequestMode}}, } t.Run("Should return empty metadata, dist/ is not present", func(t *testing.T) { @@ -44,10 +44,10 @@ func TestGetMetadata(t *testing.T) { } } -func testMetadata(t *testing.T, dir string, version string, mode config.VersionMode) { +func testMetadata(t *testing.T, dir string, version string, releaseMode config.ReleaseMode) { t.Helper() file := filepath.Join(dir, "version.json") - createVersionJSON(t, version, file, mode) + createVersionJSON(t, version, file, releaseMode) metadata, err := config.GetMetadata(file) require.NoError(t, err) @@ -59,11 +59,11 @@ func testMetadata(t *testing.T, dir string, version string, mode config.VersionM t.Run("with a valid release mode from the built-in list", func(t *testing.T) { expMode := metadata.ReleaseMode require.NoError(t, err) - require.Equal(t, expMode, mode) + require.Equal(t, expMode, releaseMode) }) t.Run("with a valid configuration from a JSON file", func(t *testing.T) { - version, err := config.GetVersion(metadata.ReleaseMode) + version, err := config.GetVersion(metadata.ReleaseMode.Mode) require.NoError(t, err) parsed := verModeFromConfig(t, metadata) require.EqualValues(t, parsed, *version) @@ -77,15 +77,15 @@ func verModeFromConfig(t *testing.T, metadata *config.Metadata) config.Version { require.NoError(t, json.Unmarshal(configJSON, &metadataComp)) - return metadataComp[metadata.ReleaseMode] + return metadataComp[metadata.ReleaseMode.Mode] } -func createVersionJSON(t *testing.T, version string, file string, mode config.VersionMode) { +func createVersionJSON(t *testing.T, version string, file string, releaseMode config.ReleaseMode) { t.Helper() metadata := &config.Metadata{ GrafanaVersion: version, - ReleaseMode: mode, + ReleaseMode: releaseMode, } //nolint:gosec diff --git a/pkg/build/config/versions.go b/pkg/build/config/versions.go index a1294992482..b3e383c2bb4 100644 --- a/pkg/build/config/versions.go +++ b/pkg/build/config/versions.go @@ -74,67 +74,7 @@ var Versions = VersionMap{ PackagesBucketEnterprise2: "grafana-downloads-enterprise2", CDNAssetsBucket: "grafana-static-assets", }, - ReleaseMode: { - Variants: []Variant{ - VariantArmV6, - VariantArmV7, - VariantArmV7Musl, - VariantArm64, - VariantArm64Musl, - VariantDarwinAmd64, - VariantWindowsAmd64, - VariantLinuxAmd64, - VariantLinuxAmd64Musl, - }, - PluginSignature: PluginSignature{ - Sign: true, - AdminSign: true, - }, - Docker: Docker{ - ShouldSave: true, - Architectures: []Architecture{ - ArchAMD64, - ArchARM64, - ArchARMv7, - }, - }, - PackagesBucket: "grafana-prerelease/artifacts/downloads", - CDNAssetsBucket: "grafana-prerelease", - CDNAssetsDir: "artifacts/static-assets", - StorybookBucket: "grafana-prerelease", - StorybookSrcDir: "artifacts/storybook", - }, - BetaReleaseMode: { - Variants: []Variant{ - VariantArmV6, - VariantArmV7, - VariantArmV7Musl, - VariantArm64, - VariantArm64Musl, - VariantDarwinAmd64, - VariantWindowsAmd64, - VariantLinuxAmd64, - VariantLinuxAmd64Musl, - }, - PluginSignature: PluginSignature{ - Sign: true, - AdminSign: true, - }, - Docker: Docker{ - ShouldSave: true, - Architectures: []Architecture{ - ArchAMD64, - ArchARM64, - ArchARMv7, - }, - }, - PackagesBucket: "grafana-prerelease/artifacts/downloads", - CDNAssetsBucket: "grafana-prerelease", - CDNAssetsDir: "artifacts/static-assets", - StorybookBucket: "grafana-prerelease", - StorybookSrcDir: "artifacts/storybook", - }, - TestReleaseMode: { + TagMode: { Variants: []Variant{ VariantArmV6, VariantArmV7, diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 500ded72a9f..fe6b7b1acab 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1,6 +1,6 @@ load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket') -grabpl_version = 'v3.0.1' +grabpl_version = 'v3.0.2' build_image = 'grafana/build-container:1.5.9' publish_image = 'grafana/grafana-ci-deploy:1.3.3' deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'