CI: Remove `grabpl` dependency from `publish-packages` steps (#65329)
Remove grabpl dependency from publish packages
(cherry picked from commit 3b00d2c273)
# Conflicts:
# .drone.yml
This commit is contained in:
+5
-17
@@ -4471,12 +4471,6 @@ platform:
|
||||
os: linux
|
||||
services: []
|
||||
steps:
|
||||
- commands:
|
||||
- mkdir -p bin
|
||||
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl
|
||||
- chmod +x bin/grabpl
|
||||
image: byrnedo/alpine-curl:0.1.8
|
||||
name: grabpl
|
||||
- commands:
|
||||
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
|
||||
depends_on: []
|
||||
@@ -4485,7 +4479,7 @@ steps:
|
||||
image: golang:1.20.1
|
||||
name: compile-build-cmd
|
||||
- depends_on:
|
||||
- grabpl
|
||||
- compile-build-cmd
|
||||
image: us.gcr.io/kubernetes-dev/package-publish:latest
|
||||
name: publish-linux-packages-deb
|
||||
privileged: true
|
||||
@@ -4506,7 +4500,7 @@ steps:
|
||||
from_secret: packages_service_account
|
||||
target_bucket: grafana-packages
|
||||
- depends_on:
|
||||
- grabpl
|
||||
- compile-build-cmd
|
||||
image: us.gcr.io/kubernetes-dev/package-publish:latest
|
||||
name: publish-linux-packages-rpm
|
||||
privileged: true
|
||||
@@ -4568,12 +4562,6 @@ platform:
|
||||
os: linux
|
||||
services: []
|
||||
steps:
|
||||
- commands:
|
||||
- mkdir -p bin
|
||||
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.30/grabpl
|
||||
- chmod +x bin/grabpl
|
||||
image: byrnedo/alpine-curl:0.1.8
|
||||
name: grabpl
|
||||
- commands:
|
||||
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
|
||||
depends_on: []
|
||||
@@ -4582,7 +4570,7 @@ steps:
|
||||
image: golang:1.20.1
|
||||
name: compile-build-cmd
|
||||
- depends_on:
|
||||
- grabpl
|
||||
- compile-build-cmd
|
||||
image: us.gcr.io/kubernetes-dev/package-publish:latest
|
||||
name: publish-linux-packages-deb
|
||||
privileged: true
|
||||
@@ -4603,7 +4591,7 @@ steps:
|
||||
from_secret: packages_service_account
|
||||
target_bucket: grafana-packages
|
||||
- depends_on:
|
||||
- grabpl
|
||||
- compile-build-cmd
|
||||
image: us.gcr.io/kubernetes-dev/package-publish:latest
|
||||
name: publish-linux-packages-rpm
|
||||
privileged: true
|
||||
@@ -6563,6 +6551,6 @@ kind: secret
|
||||
name: enterprise2_security_prefix
|
||||
---
|
||||
kind: signature
|
||||
hmac: cefe303c3e3e5b88021174d5b5c66f79076dbc043ae2762c6d6c586cdb96dbf6
|
||||
hmac: 1eed7e78b481de96730fff025aff5c643a7f91c7000fa69f91f30a4493548113
|
||||
|
||||
...
|
||||
|
||||
@@ -575,7 +575,6 @@ def publish_packages_pipeline():
|
||||
"target": ["public"],
|
||||
}
|
||||
oss_steps = [
|
||||
download_grabpl_step(),
|
||||
compile_build_cmd(),
|
||||
publish_linux_packages_step(edition = "oss", package_manager = "deb"),
|
||||
publish_linux_packages_step(edition = "oss", package_manager = "rpm"),
|
||||
@@ -583,7 +582,6 @@ def publish_packages_pipeline():
|
||||
]
|
||||
|
||||
enterprise_steps = [
|
||||
download_grabpl_step(),
|
||||
compile_build_cmd(),
|
||||
publish_linux_packages_step(edition = "enterprise", package_manager = "deb"),
|
||||
publish_linux_packages_step(edition = "enterprise", package_manager = "rpm"),
|
||||
|
||||
@@ -1225,7 +1225,7 @@ def publish_linux_packages_step(edition, package_manager = "deb"):
|
||||
"name": "publish-linux-packages-{}".format(package_manager),
|
||||
# See https://github.com/grafana/deployment_tools/blob/master/docker/package-publish/README.md for docs on that image
|
||||
"image": "us.gcr.io/kubernetes-dev/package-publish:latest",
|
||||
"depends_on": ["grabpl"],
|
||||
"depends_on": ["compile-build-cmd"],
|
||||
"privileged": True,
|
||||
"settings": {
|
||||
"access_key_id": from_secret("packages_access_key_id"),
|
||||
|
||||
Reference in New Issue
Block a user