diff --git a/.drone.yml b/.drone.yml index c7b90273328..8dfc05c4ab8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 ... diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star index 9db71417e25..e876cdc08f1 100644 --- a/scripts/drone/events/release.star +++ b/scripts/drone/events/release.star @@ -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"), diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 5ba5d620aa0..8ab20540110 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -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"),