IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 08:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Replace publish keyword with store (#43340)

Browse Source 
* Replace publish keyword with store

* Rename publish_steps with store_steps

* Update grabpl version
This commit is contained in:
Dimitris Sotirakis
2021-12-20 12:23:51 +01:00
committed by GitHub
parent 0dc86bf7f4
commit d88502112f
4 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/drone/pipelines/main.star
+11 -11
View File
@@ -29,10 +29,10 @@ load(
'benchmark_ldap_step',
'enterprise_downstream_step',
'frontend_metrics_step',
'publish_storybook_step',
'store_storybook_step',
'release_canary_npm_packages_step',
'upload_packages_step',
'publish_packages_step',
'store_packages_step',
'upload_cdn_step',
'validate_scuemata_step',
'ensure_cuetsified_step',
@@ -106,7 +106,7 @@ def get_steps(edition, is_downstream=False):
e2e_tests_step('panels-suite', edition=edition),
e2e_tests_step('various-suite', edition=edition),
build_storybook_step(edition=edition, ver_mode=ver_mode),
publish_storybook_step(edition=edition, ver_mode=ver_mode),
store_storybook_step(edition=edition, ver_mode=ver_mode),
test_a11y_frontend_step(ver_mode=ver_mode, edition=edition),
frontend_metrics_step(edition=edition),
build_frontend_docs_step(edition=edition),
@@ -134,13 +134,13 @@ def get_steps(edition, is_downstream=False):
windows_steps = get_windows_steps(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream)
if edition == 'enterprise' and not is_downstream:
publish_steps = []
store_steps = []
else:
publish_steps = [
publish_packages_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
store_steps = [
store_packages_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
]
return test_steps, build_steps, integration_test_steps, windows_steps, publish_steps
return test_steps, build_steps, integration_test_steps, windows_steps, store_steps
def main_pipelines(edition):
services = integration_test_services(edition)
@@ -161,7 +161,7 @@ def main_pipelines(edition):
],
},
}
test_steps, build_steps, integration_test_steps, windows_steps, publish_steps = get_steps(edition=edition)
test_steps, build_steps, integration_test_steps, windows_steps, store_steps = get_steps(edition=edition)
if edition == 'enterprise':
services.append(ldap_service())
@@ -194,7 +194,7 @@ def main_pipelines(edition):
if edition != 'enterprise':
pipelines.append(pipeline(
name='publish-main', edition=edition, trigger=trigger,
steps=[download_grabpl_step()] + initialize_step(edition, platform='linux', ver_mode=ver_mode, install_deps=False) + publish_steps,
steps=[download_grabpl_step()] + initialize_step(edition, platform='linux', ver_mode=ver_mode, install_deps=False) + store_steps,
depends_on=['main-test', 'main-build-e2e-publish', 'main-integration-tests', 'windows-main',],
))
@@ -207,7 +207,7 @@ def main_pipelines(edition):
trigger = {
'event': ['custom',],
}
test_steps, build_steps, integration_test_steps, windows_steps, publish_steps = get_steps(edition=edition, is_downstream=True)
test_steps, build_steps, integration_test_steps, windows_steps, store_steps = get_steps(edition=edition, is_downstream=True)
pipelines.append(pipeline(
name='build-main-downstream', edition=edition, trigger=trigger, services=services,
steps=[download_grabpl_step()] + initialize_step(edition, platform='linux', ver_mode=ver_mode, is_downstream=True) + test_steps + build_steps + integration_test_steps,
@@ -220,7 +220,7 @@ def main_pipelines(edition):
))
pipelines.append(pipeline(
name='publish-main-downstream', edition=edition, trigger=trigger,
steps=[download_grabpl_step()] + initialize_step(edition, platform='linux', ver_mode=ver_mode, is_downstream=True, install_deps=False) + publish_steps,
steps=[download_grabpl_step()] + initialize_step(edition, platform='linux', ver_mode=ver_mode, is_downstream=True, install_deps=False) + store_steps,
depends_on=['build-main-downstream', 'windows-main-downstream'],
))
scripts/drone/pipelines/release.star
+12 -12
View File
@@ -30,9 +30,9 @@ load(
'get_windows_steps',
'benchmark_ldap_step',
'frontend_metrics_step',
'publish_storybook_step',
'store_storybook_step',
'upload_packages_step',
'publish_packages_step',
'store_packages_step',
'upload_cdn_step',
'validate_scuemata_step',
'ensure_cuetsified_step'
@@ -62,8 +62,8 @@ def build_npm_packages_step(edition, ver_mode):
'name': 'build-npm-packages',
'image': build_image,
'depends_on': [
# Has to run after publish-storybook since this step cleans the files publish-storybook depends on
'publish-storybook',
# Has to run after store-storybook since this step cleans the files publish-storybook depends on
'store-storybook',
],
'commands': ['./scripts/build/build-npm-packages.sh ${DRONE_TAG}'],
}
@@ -93,8 +93,8 @@ def retrieve_npm_packages_step(edition, ver_mode):
'name': 'retrieve-npm-packages',
'image': publish_image,
'depends_on': [
# Has to run after publish-storybook since this step cleans the files publish-storybook depends on
'publish-storybook',
# Has to run after store-storybook since this step cleans the files publish-storybook depends on
'store-storybook',
],
'environment': {
'GCP_KEY': from_secret('gcp_key'),
@@ -181,7 +181,7 @@ def get_steps(edition, ver_mode):
publish_steps.append(upload_cdn_step(edition=edition, ver_mode=ver_mode))
publish_steps.append(upload_packages_step(edition=edition, ver_mode=ver_mode))
if should_publish:
publish_step = publish_storybook_step(edition=edition, ver_mode=ver_mode)
publish_step = store_storybook_step(edition=edition, ver_mode=ver_mode)
build_npm_step = build_npm_packages_step(edition=edition, ver_mode=ver_mode)
store_npm_step = store_npm_packages_step(edition=edition, ver_mode=ver_mode)
if publish_step:
@@ -263,8 +263,8 @@ def release_pipelines(ver_mode='release', trigger=None):
pipelines = oss_pipelines + enterprise_pipelines
if should_publish:
steps = [
publish_packages_step(edition='oss', ver_mode=ver_mode),
publish_packages_step(edition='enterprise', ver_mode=ver_mode),
store_packages_step(edition='oss', ver_mode=ver_mode),
store_packages_step(edition='enterprise', ver_mode=ver_mode),
]
publish_pipeline = pipeline(
name='publish-{}'.format(ver_mode), trigger=trigger, edition='oss',
@@ -290,11 +290,11 @@ def test_release_pipelines():
oss_pipelines = get_oss_pipelines(ver_mode=ver_mode, trigger=trigger)
enterprise_pipelines = get_enterprise_pipelines(ver_mode=ver_mode, trigger=trigger)
publish_cmd = './bin/grabpl publish-packages --edition {{}} --dry-run {}'.format(test_release_ver)
publish_cmd = './bin/grabpl store-packages --edition {{}} --dry-run {}'.format(test_release_ver)
steps = [
publish_packages_step(edition='oss', ver_mode=ver_mode),
publish_packages_step(edition='enterprise', ver_mode=ver_mode),
store_packages_step(edition='oss', ver_mode=ver_mode),
store_packages_step(edition='enterprise', ver_mode=ver_mode),
]
publish_pipeline = pipeline(
scripts/drone/steps/lib.star
+8 -8
View File
@@ -1,6 +1,6 @@
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
grabpl_version = '2.7.5'
grabpl_version = '2.7.8'
build_image = 'grafana/build-container:1.4.8'
publish_image = 'grafana/grafana-ci-deploy:1.3.1'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
@@ -251,7 +251,7 @@ def build_storybook_step(edition, ver_mode):
}
def publish_storybook_step(edition, ver_mode):
def store_storybook_step(edition, ver_mode):
if edition in ('enterprise', 'enterprise2'):
return None
@@ -275,7 +275,7 @@ def publish_storybook_step(edition, ver_mode):
])
return {
'name': 'publish-storybook',
'name': 'store-storybook',
'image': publish_image,
'depends_on': [
'build-storybook',
@@ -968,15 +968,15 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
}
def publish_packages_step(edition, ver_mode, is_downstream=False):
def store_packages_step(edition, ver_mode, is_downstream=False):
if ver_mode == 'test-release':
cmd = './bin/grabpl publish-packages --edition {} --gcp-key /tmp/gcpkey.json '.format(edition) + \
cmd = './bin/grabpl store-packages --edition {} --gcp-key /tmp/gcpkey.json '.format(edition) + \
'--deb-db-bucket grafana-testing-aptly-db --deb-repo-bucket grafana-testing-repo --packages-bucket ' + \
'grafana-downloads-test --rpm-repo-bucket grafana-testing-repo --simulate-release {}'.format(
test_release_ver,
)
elif ver_mode == 'release':
cmd = './bin/grabpl publish-packages --edition {} --gcp-key /tmp/gcpkey.json ${{DRONE_TAG}}'.format(
cmd = './bin/grabpl store-packages --edition {} --gcp-key /tmp/gcpkey.json ${{DRONE_TAG}}'.format(
edition,
)
elif ver_mode == 'main':
@@ -984,14 +984,14 @@ def publish_packages_step(edition, ver_mode, is_downstream=False):
build_no = '${DRONE_BUILD_NUMBER}'
else:
build_no = '$${SOURCE_BUILD_NUMBER}'
cmd = './bin/grabpl publish-packages --edition {} --gcp-key /tmp/gcpkey.json --build-id {}'.format(
cmd = './bin/grabpl store-packages --edition {} --gcp-key /tmp/gcpkey.json --build-id {}'.format(
edition, build_no,
)
else:
fail('Unexpected version mode {}'.format(ver_mode))
return {
'name': 'publish-packages-{}'.format(edition),
'name': 'store-packages-{}'.format(edition),
'image': publish_image,
'depends_on': [
'initialize',