Change from grabpl to build for grafana-com (#56434)

This commit is contained in:
Dimitris Sotirakis
2022-10-06 10:14:38 +03:00
committed by GitHub
parent fe1395a1ec
commit ec7d9e196e
4 changed files with 33 additions and 16 deletions

View File

@@ -3666,6 +3666,13 @@ steps:
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
- commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.19.1
name: compile-build-cmd
- commands: - commands:
- ./bin/grabpl publish packages --edition oss --gcp-key /tmp/gcpkey.json ${DRONE_TAG} - ./bin/grabpl publish packages --edition oss --gcp-key /tmp/gcpkey.json ${DRONE_TAG}
depends_on: depends_on:
@@ -3684,7 +3691,7 @@ steps:
image: grafana/grafana-ci-deploy:1.3.3 image: grafana/grafana-ci-deploy:1.3.3
name: publish-packages-oss name: publish-packages-oss
- commands: - commands:
- ./bin/grabpl publish grafana-com --edition oss ${DRONE_TAG} - ./bin/build publish grafana-com --edition oss ${DRONE_TAG}
depends_on: depends_on:
- publish-packages-oss - publish-packages-oss
environment: environment:
@@ -3748,6 +3755,13 @@ steps:
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
- commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.19.1
name: compile-build-cmd
- commands: - commands:
- ./bin/grabpl publish packages --edition enterprise --gcp-key /tmp/gcpkey.json - ./bin/grabpl publish packages --edition enterprise --gcp-key /tmp/gcpkey.json
${DRONE_TAG} ${DRONE_TAG}
@@ -3767,7 +3781,7 @@ steps:
image: grafana/grafana-ci-deploy:1.3.3 image: grafana/grafana-ci-deploy:1.3.3
name: publish-packages-enterprise name: publish-packages-enterprise
- commands: - commands:
- ./bin/grabpl publish grafana-com --edition enterprise ${DRONE_TAG} - ./bin/build publish grafana-com --edition enterprise ${DRONE_TAG}
depends_on: depends_on:
- publish-packages-enterprise - publish-packages-enterprise
environment: environment:
@@ -5236,15 +5250,16 @@ platform:
os: linux os: linux
steps: steps:
- commands: - commands:
- mkdir -p bin - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.0.11/grabpl depends_on: []
- chmod +x bin/grabpl environment:
image: byrnedo/alpine-curl:0.1.8 CGO_ENABLED: 0
name: grabpl image: golang:1.19.1
name: compile-build-cmd
- commands: - commands:
- ./bin/grabpl publish grafana-com --edition oss - ./bin/build publish grafana-com --edition oss
depends_on: depends_on:
- grabpl - compile-build-cmd
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
@@ -5324,6 +5339,6 @@ kind: secret
name: packages_secret_access_key name: packages_secret_access_key
--- ---
kind: signature kind: signature
hmac: 539cf8d41fba415e57c706a53c93b0f92ff3f69c48ba43526ea95ae506690d2d hmac: 5ff426194c616a934af92cb113aebbb6cebf06d6317e62a693f4f8d7faa3b4cd
... ...

View File

@@ -1,5 +1,5 @@
load('scripts/drone/vault.star', 'from_secret', 'pull_secret') load('scripts/drone/vault.star', 'from_secret', 'pull_secret')
load('scripts/drone/steps/lib.star', 'publish_image', 'download_grabpl_step') load('scripts/drone/steps/lib.star', 'publish_image', 'compile_build_cmd')
aquasec_trivy_image = 'aquasec/trivy:0.21.0' aquasec_trivy_image = 'aquasec/trivy:0.21.0'
@@ -7,7 +7,7 @@ def cronjobs(edition):
grafana_com_nightly_pipeline = cron_job_pipeline( grafana_com_nightly_pipeline = cron_job_pipeline(
cronName='grafana-com-nightly', cronName='grafana-com-nightly',
name='grafana-com-nightly', name='grafana-com-nightly',
steps=[download_grabpl_step(),post_to_grafana_com_step()] steps=[compile_build_cmd(),post_to_grafana_com_step()]
) )
return [ return [
scan_docker_image_pipeline(edition, 'latest'), scan_docker_image_pipeline(edition, 'latest'),
@@ -93,7 +93,7 @@ def post_to_grafana_com_step():
'GRAFANA_COM_API_KEY': from_secret('grafana_api_key'), 'GRAFANA_COM_API_KEY': from_secret('grafana_api_key'),
'GCP_KEY': from_secret('gcp_key'), 'GCP_KEY': from_secret('gcp_key'),
}, },
'depends_on': ['grabpl'], 'depends_on': ['compile-build-cmd'],
'commands': ['./bin/grabpl publish grafana-com --edition oss'], 'commands': ['./bin/build publish grafana-com --edition oss'],
} }

View File

@@ -404,6 +404,7 @@ def publish_packages_pipeline():
} }
oss_steps = [ oss_steps = [
download_grabpl_step(), download_grabpl_step(),
compile_build_cmd(),
publish_packages_step(edition='oss', ver_mode='release'), publish_packages_step(edition='oss', ver_mode='release'),
publish_grafanacom_step(edition='oss', ver_mode='release'), publish_grafanacom_step(edition='oss', ver_mode='release'),
publish_linux_packages_step(edition='oss'), publish_linux_packages_step(edition='oss'),
@@ -411,6 +412,7 @@ def publish_packages_pipeline():
enterprise_steps = [ enterprise_steps = [
download_grabpl_step(), download_grabpl_step(),
compile_build_cmd(),
publish_packages_step(edition='enterprise', ver_mode='release'), publish_packages_step(edition='enterprise', ver_mode='release'),
publish_grafanacom_step(edition='enterprise', ver_mode='release'), publish_grafanacom_step(edition='enterprise', ver_mode='release'),
publish_linux_packages_step(edition='enterprise'), publish_linux_packages_step(edition='enterprise'),

View File

@@ -1012,12 +1012,12 @@ def publish_packages_step(edition, ver_mode):
def publish_grafanacom_step(edition, ver_mode): def publish_grafanacom_step(edition, ver_mode):
if ver_mode == 'release': if ver_mode == 'release':
cmd = './bin/grabpl publish grafana-com --edition {} ${{DRONE_TAG}}'.format( cmd = './bin/build publish grafana-com --edition {} ${{DRONE_TAG}}'.format(
edition, edition,
) )
elif ver_mode == 'main': elif ver_mode == 'main':
build_no = '${DRONE_BUILD_NUMBER}' build_no = '${DRONE_BUILD_NUMBER}'
cmd = './bin/grabpl publish grafana-com --edition {} --build-id {}'.format( cmd = './bin/build publish grafana-com --edition {} --build-id {}'.format(
edition, build_no, edition, build_no,
) )
else: else: