Skip to content

Commit 7a12132

Browse files
authored
DEB/RPM Packages: Remove old package publishing steps (grafana#58071)
* Remove old publish package steps * Don't ignore publish packaging failures
1 parent 9e03355 commit 7a12132

File tree

8 files changed

+31
-364
lines changed

8 files changed

+31
-364
lines changed

.drone.yml

Lines changed: 25 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1730,78 +1730,8 @@ type: docker
17301730
clone:
17311731
retries: 3
17321732
depends_on:
1733-
- main-test-frontend
1734-
- main-test-backend
17351733
- main-build-e2e-publish
17361734
- main-integration-tests
1737-
- main-windows
1738-
image_pull_secrets:
1739-
- dockerconfigjson
1740-
kind: pipeline
1741-
name: main-publish
1742-
node:
1743-
type: no-parallel
1744-
platform:
1745-
arch: amd64
1746-
os: linux
1747-
services: []
1748-
steps:
1749-
- commands:
1750-
- mkdir -p bin
1751-
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.15/grabpl
1752-
- chmod +x bin/grabpl
1753-
image: byrnedo/alpine-curl:0.1.8
1754-
name: grabpl
1755-
- commands:
1756-
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
1757-
depends_on: []
1758-
environment:
1759-
CGO_ENABLED: 0
1760-
image: golang:1.19.2
1761-
name: compile-build-cmd
1762-
- commands:
1763-
- echo $DRONE_RUNNER_NAME
1764-
image: alpine:3.15.6
1765-
name: identify-runner
1766-
- commands:
1767-
- ./bin/build publish packages --edition oss --gcp-key /tmp/gcpkey.json --build-id
1768-
${DRONE_BUILD_NUMBER}
1769-
depends_on:
1770-
- compile-build-cmd
1771-
environment:
1772-
GCP_KEY:
1773-
from_secret: gcp_key
1774-
GPG_KEY_PASSWORD:
1775-
from_secret: gpg_key_password
1776-
GPG_PRIV_KEY:
1777-
from_secret: gpg_priv_key
1778-
GPG_PUB_KEY:
1779-
from_secret: gpg_pub_key
1780-
GRAFANA_COM_API_KEY:
1781-
from_secret: grafana_api_key
1782-
image: grafana/grafana-ci-deploy:1.3.3
1783-
name: publish-packages-oss
1784-
trigger:
1785-
branch: main
1786-
event:
1787-
- push
1788-
paths:
1789-
exclude:
1790-
- '*.md'
1791-
- docs/**
1792-
- latest.json
1793-
repo:
1794-
- grafana/grafana
1795-
type: docker
1796-
volumes:
1797-
- host:
1798-
path: /var/run/docker.sock
1799-
name: docker
1800-
---
1801-
clone:
1802-
retries: 3
1803-
depends_on:
1804-
- main-publish
18051735
image_pull_secrets:
18061736
- dockerconfigjson
18071737
kind: pipeline
@@ -1847,7 +1777,6 @@ depends_on:
18471777
- main-build-e2e-publish
18481778
- main-integration-tests
18491779
- main-windows
1850-
- main-publish
18511780
kind: pipeline
18521781
name: main-notify
18531782
platform:
@@ -3659,37 +3588,8 @@ steps:
36593588
CGO_ENABLED: 0
36603589
image: golang:1.19.2
36613590
name: compile-build-cmd
3662-
- commands:
3663-
- ./bin/build publish packages --edition oss --gcp-key /tmp/gcpkey.json ${DRONE_TAG}
3664-
depends_on:
3665-
- compile-build-cmd
3666-
environment:
3667-
GCP_KEY:
3668-
from_secret: gcp_key
3669-
GPG_KEY_PASSWORD:
3670-
from_secret: gpg_key_password
3671-
GPG_PRIV_KEY:
3672-
from_secret: gpg_priv_key
3673-
GPG_PUB_KEY:
3674-
from_secret: gpg_pub_key
3675-
GRAFANA_COM_API_KEY:
3676-
from_secret: grafana_api_key
3677-
image: grafana/grafana-ci-deploy:1.3.3
3678-
name: publish-packages-oss
3679-
- commands:
3680-
- ./bin/build publish grafana-com --edition oss ${DRONE_TAG}
3681-
depends_on:
3682-
- publish-packages-oss
3683-
environment:
3684-
GCP_KEY:
3685-
from_secret: gcp_key
3686-
GRAFANA_COM_API_KEY:
3687-
from_secret: grafana_api_key
3688-
image: grafana/grafana-ci-deploy:1.3.3
3689-
name: publish-grafanacom-oss
36903591
- depends_on:
36913592
- grabpl
3692-
failure: ignore
36933593
image: us.gcr.io/kubernetes-dev/package-publish:latest
36943594
name: publish-linux-packages-deb
36953595
privileged: true
@@ -3711,7 +3611,6 @@ steps:
37113611
target_bucket: grafana-packages
37123612
- depends_on:
37133613
- grabpl
3714-
failure: ignore
37153614
image: us.gcr.io/kubernetes-dev/package-publish:latest
37163615
name: publish-linux-packages-rpm
37173616
privileged: true
@@ -3731,6 +3630,18 @@ steps:
37313630
service_account_json:
37323631
from_secret: packages_service_account
37333632
target_bucket: grafana-packages
3633+
- commands:
3634+
- ./bin/build publish grafana-com --edition oss ${DRONE_TAG}
3635+
depends_on:
3636+
- publish-linux-packages-deb
3637+
- publish-linux-packages-rpm
3638+
environment:
3639+
GCP_KEY:
3640+
from_secret: gcp_key
3641+
GRAFANA_COM_API_KEY:
3642+
from_secret: grafana_api_key
3643+
image: grafana/grafana-ci-deploy:1.3.3
3644+
name: publish-grafanacom-oss
37343645
trigger:
37353646
event:
37363647
- promote
@@ -3772,37 +3683,8 @@ steps:
37723683
CGO_ENABLED: 0
37733684
image: golang:1.19.2
37743685
name: compile-build-cmd
3775-
- commands:
3776-
- ./bin/build publish packages --edition enterprise --gcp-key /tmp/gcpkey.json ${DRONE_TAG}
3777-
depends_on:
3778-
- compile-build-cmd
3779-
environment:
3780-
GCP_KEY:
3781-
from_secret: gcp_key
3782-
GPG_KEY_PASSWORD:
3783-
from_secret: gpg_key_password
3784-
GPG_PRIV_KEY:
3785-
from_secret: gpg_priv_key
3786-
GPG_PUB_KEY:
3787-
from_secret: gpg_pub_key
3788-
GRAFANA_COM_API_KEY:
3789-
from_secret: grafana_api_key
3790-
image: grafana/grafana-ci-deploy:1.3.3
3791-
name: publish-packages-enterprise
3792-
- commands:
3793-
- ./bin/build publish grafana-com --edition enterprise ${DRONE_TAG}
3794-
depends_on:
3795-
- publish-packages-enterprise
3796-
environment:
3797-
GCP_KEY:
3798-
from_secret: gcp_key
3799-
GRAFANA_COM_API_KEY:
3800-
from_secret: grafana_api_key
3801-
image: grafana/grafana-ci-deploy:1.3.3
3802-
name: publish-grafanacom-enterprise
38033686
- depends_on:
38043687
- grabpl
3805-
failure: ignore
38063688
image: us.gcr.io/kubernetes-dev/package-publish:latest
38073689
name: publish-linux-packages-deb
38083690
privileged: true
@@ -3824,7 +3706,6 @@ steps:
38243706
target_bucket: grafana-packages
38253707
- depends_on:
38263708
- grabpl
3827-
failure: ignore
38283709
image: us.gcr.io/kubernetes-dev/package-publish:latest
38293710
name: publish-linux-packages-rpm
38303711
privileged: true
@@ -3844,6 +3725,18 @@ steps:
38443725
service_account_json:
38453726
from_secret: packages_service_account
38463727
target_bucket: grafana-packages
3728+
- commands:
3729+
- ./bin/build publish grafana-com --edition enterprise ${DRONE_TAG}
3730+
depends_on:
3731+
- publish-linux-packages-deb
3732+
- publish-linux-packages-rpm
3733+
environment:
3734+
GCP_KEY:
3735+
from_secret: gcp_key
3736+
GRAFANA_COM_API_KEY:
3737+
from_secret: grafana_api_key
3738+
image: grafana/grafana-ci-deploy:1.3.3
3739+
name: publish-grafanacom-enterprise
38473740
trigger:
38483741
event:
38493742
- promote
@@ -5423,6 +5316,6 @@ kind: secret
54235316
name: packages_secret_access_key
54245317
---
54255318
kind: signature
5426-
hmac: bbc179e84a651150c80ff37442ae77605613dfdda47aa72604016b090715a12b
5319+
hmac: b7a812befcaa64d70ce856f290029308d9c73f3b479bd24387e698081275e084
54275320

54285321
...

pkg/build/cmd/main.go

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import (
55
"os"
66
"strings"
77

8-
"github.com/grafana/grafana/pkg/build/config"
98
"github.com/grafana/grafana/pkg/build/docker"
10-
"github.com/grafana/grafana/pkg/build/packaging"
119
"github.com/urfave/cli/v2"
1210
)
1311

@@ -175,48 +173,6 @@ func main() {
175173
Name: "publish",
176174
Usage: "Publish packages to Grafana com and repositories",
177175
Subcommands: cli.Commands{
178-
{
179-
Name: "packages",
180-
Usage: "publish Grafana packages",
181-
ArgsUsage: "[version]",
182-
Action: PublishPackages,
183-
Flags: []cli.Flag{
184-
&jobsFlag,
185-
&editionFlag,
186-
&buildIDFlag,
187-
&dryRunFlag,
188-
&gcpKeyFlag,
189-
&cli.StringFlag{
190-
Name: "packages-bucket",
191-
Value: config.PublicBucket,
192-
Usage: "Google Cloud Storage Debian database bucket",
193-
},
194-
&cli.StringFlag{
195-
Name: "deb-db-bucket",
196-
Value: packaging.DefaultDebDBBucket,
197-
Usage: "Google Cloud Storage Debian database bucket",
198-
},
199-
&cli.StringFlag{
200-
Name: "deb-repo-bucket",
201-
Value: packaging.DefaultDebRepoBucket,
202-
Usage: "Google Cloud Storage Debian repo bucket",
203-
},
204-
&cli.StringFlag{
205-
Name: "rpm-repo-bucket",
206-
Value: packaging.DefaultRPMRepoBucket,
207-
Usage: "Google Cloud Storage RPM repo bucket",
208-
},
209-
&cli.StringFlag{
210-
Name: "ttl",
211-
Value: packaging.DefaultTTLSeconds,
212-
Usage: "Cache time to live for uploaded packages",
213-
},
214-
&cli.BoolFlag{
215-
Name: "simulate-release",
216-
Usage: "Only simulate creating release at grafana.com",
217-
},
218-
},
219-
},
220176
{
221177
Name: "grafana-com",
222178
Usage: "Publish packages to grafana.com",

0 commit comments

Comments
 (0)