From 5cbb7003c0289518992cf090d0ae92be9cbe7718 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Thu, 7 Jul 2022 18:00:28 +0300 Subject: [PATCH] Add artifacts-page grabpl command (#51894) --- .drone.star | 4 ++-- .drone.yml | 34 +++++++++++++++++++++++++++- scripts/drone/pipelines/release.star | 10 +++++++- scripts/drone/steps/lib.star | 12 ++++++++++ 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index 0829f79f299..b9d6ab67c91 100644 --- a/.drone.star +++ b/.drone.star @@ -7,7 +7,7 @@ load('scripts/drone/pipelines/pr.star', 'pr_pipelines') load('scripts/drone/pipelines/main.star', 'main_pipelines') load('scripts/drone/pipelines/docs.star', 'docs_pipelines') -load('scripts/drone/pipelines/release.star', 'release_pipelines', 'publish_image_pipelines', 'publish_artifacts_pipelines', 'publish_npm_pipelines', 'publish_packages_pipeline') +load('scripts/drone/pipelines/release.star', 'release_pipelines', 'publish_image_pipelines', 'publish_artifacts_pipelines', 'publish_npm_pipelines', 'publish_packages_pipeline', 'artifacts_page_pipeline') load('scripts/drone/version.star', 'version_branch_pipelines') load('scripts/drone/pipelines/cron.star', 'cronjobs') load('scripts/drone/vault.star', 'secrets') @@ -17,5 +17,5 @@ def main(ctx): return pr_pipelines(edition=edition) + main_pipelines(edition=edition) + release_pipelines() + \ publish_image_pipelines('public') + publish_image_pipelines('security') + \ publish_artifacts_pipelines('security') + publish_artifacts_pipelines('public') + \ - publish_npm_pipelines('public') + publish_packages_pipeline() + \ + publish_npm_pipelines('public') + publish_packages_pipeline() + artifacts_page_pipeline() + \ version_branch_pipelines() + cronjobs(edition=edition) + secrets() diff --git a/.drone.yml b/.drone.yml index a7b75740313..0c3576300f5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3414,6 +3414,38 @@ volumes: --- depends_on: [] kind: pipeline +name: publish-artifacts-page +node: + type: no-parallel +platform: + arch: amd64 + os: linux +services: [] +steps: +- commands: + - mkdir -p bin + - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl + - chmod +x bin/grabpl + image: byrnedo/alpine-curl:0.1.8 + name: grabpl +- commands: + - ./bin/grabpl artifacts-page + depends_on: + - grabpl + image: grafana/build-container:1.5.7 + name: artifacts-page +trigger: + event: + - promote + target: security +type: docker +volumes: +- host: + path: /var/run/docker.sock + name: docker +--- +depends_on: [] +kind: pipeline name: release-branch-oss-build-e2e-publish node: type: no-parallel @@ -4811,6 +4843,6 @@ kind: secret name: gcp_upload_artifacts_key --- kind: signature -hmac: 02df03be213abe0242b1c47e0e57cecd1ec3b2572d1f214afb55ef3a94c99750 +hmac: 0135b400f98ec7b242dd29aebe848db0055edfe64af2f2dd589d0d8384bb2f17 ... diff --git a/scripts/drone/pipelines/release.star b/scripts/drone/pipelines/release.star index 7db0fc54333..5d4aadb25da 100644 --- a/scripts/drone/pipelines/release.star +++ b/scripts/drone/pipelines/release.star @@ -41,7 +41,8 @@ load( 'upload_cdn_step', 'verify_gen_cue_step', 'publish_images_step', - 'trigger_oss' + 'trigger_oss', + 'artifacts_page_step' ) load( @@ -431,6 +432,13 @@ def publish_npm_pipelines(mode): name='publish-npm-packages-{}'.format(mode), trigger=trigger, steps = steps, edition="all" )] +def artifacts_page_pipeline(): + trigger = { + 'event': ['promote'], + 'target': 'security', + } + return [pipeline(name='publish-artifacts-page', trigger=trigger, steps = [download_grabpl_step(), artifacts_page_step()], edition="all")] + def release_pipelines(ver_mode='release', trigger=None): # 'enterprise' edition services contain both OSS and enterprise services if not trigger: diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index 2a9fabe105c..df9af637e30 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -1173,6 +1173,18 @@ def verify_gen_cue_step(edition): ], } +def artifacts_page_step(): + return { + 'name': 'artifacts-page', + 'image': build_image, + 'depends_on': [ + 'grabpl', + ], + 'commands': [ + './bin/grabpl artifacts-page', + ], + } + def end_to_end_tests_deps(edition): if disable_tests: return []