public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Run publishing steps only on OSS repo for main/version branches (#47315)

Browse Source 
* Convert steps to run on OSS repo only

* Exclude versioned branches from publishing artifacts

* Change trigger -> when

* Add trigger to upload_* steps

* Add conditions to remaining steps

* Exclude release steps

* Bring back exclusion for release builds
This commit is contained in:
Dimitris Sotirakis
2022-04-06 10:46:05 +03:00
committed by GitHub
parent f7305965a4
commit bd386df617
5 changed files with 94 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/drone/pipelines/main.star
+15 -14
View File
@@ -38,7 +38,8 @@ load(
'upload_cdn_step',
'validate_scuemata_step',
'ensure_cuetsified_step',
'test_a11y_frontend_step'
'test_a11y_frontend_step',
'trigger_oss'
)
load(
@@ -118,23 +119,23 @@ def get_steps(edition, is_downstream=False):
e2e_tests_step('various-suite', edition=edition),
e2e_tests_artifacts(edition=edition),
build_storybook_step(edition=edition, ver_mode=ver_mode),
store_storybook_step(edition=edition, ver_mode=ver_mode),
store_storybook_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss),
test_a11y_frontend_step(ver_mode=ver_mode, edition=edition),
frontend_metrics_step(edition=edition),
frontend_metrics_step(edition=edition, trigger=trigger_oss),
copy_packages_for_docker_step(),
build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=False),
build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=False),
publish_images_step(edition=edition, ver_mode=ver_mode, mode='', docker_repo='grafana', ubuntu=False),
publish_images_step(edition=edition, ver_mode=ver_mode, mode='', docker_repo='grafana-oss', ubuntu=True)
publish_images_step(edition=edition, ver_mode=ver_mode, mode='', docker_repo='grafana', trigger=trigger_oss),
publish_images_step(edition=edition, ver_mode=ver_mode, mode='', docker_repo='grafana-oss', trigger=trigger_oss)
])
if include_enterprise2:
integration_test_steps.extend([redis_integration_tests_step(edition=edition2, ver_mode=ver_mode), memcached_integration_tests_step(edition=edition2, ver_mode=ver_mode)])
build_steps.extend([
release_canary_npm_packages_step(edition),
upload_packages_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream),
upload_cdn_step(edition=edition, ver_mode=ver_mode)
release_canary_npm_packages_step(edition, trigger=trigger_oss),
upload_packages_step(edition=edition, ver_mode=ver_mode, is_downstream=is_downstream, trigger=trigger_oss),
upload_cdn_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss)
])
if include_enterprise2:
@@ -180,7 +181,10 @@ def trigger_test_release():
'include': [
'.drone.yml',
]
}
},
'repo': [
'grafana/grafana',
]
}
}
@@ -190,9 +194,6 @@ def main_pipelines(edition):
trigger = {
'event': ['push',],
'branch': 'main',
'repo': [
'grafana/grafana',
],
}
drone_change_trigger = {
'event': ['push',],
@@ -233,7 +234,7 @@ def main_pipelines(edition):
volumes=volumes,
),
pipeline(
name='windows-main', edition=edition, trigger=trigger,
name='windows-main', edition=edition, trigger=dict(trigger, repo = ['grafana/grafana']),
steps=initialize_step(edition, platform='windows', ver_mode=ver_mode) + windows_steps,
depends_on=['main-test', 'main-build-e2e-publish', 'main-integration-tests'], platform='windows',
), notify_pipeline(
@@ -242,7 +243,7 @@ def main_pipelines(edition):
]
if edition != 'enterprise':
pipelines.append(pipeline(
name='publish-main', edition=edition, trigger=trigger,
name='publish-main', edition=edition, trigger=dict(trigger, repo = ['grafana/grafana']),
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',],
))
scripts/drone/pipelines/release.star
+5 -6
View File
@@ -4,7 +4,6 @@ load(
'download_grabpl_step',
'initialize_step',
'lint_drone_step',
'test_release_ver',
'build_image',
'publish_image',
'lint_backend_step',
@@ -31,14 +30,14 @@ load(
'memcached_integration_tests_step',
'get_windows_steps',
'benchmark_ldap_step',
'frontend_metrics_step',
'store_storybook_step',
'upload_packages_step',
'store_packages_step',
'upload_cdn_step',
'validate_scuemata_step',
'ensure_cuetsified_step',
'publish_images_step'
'publish_images_step',
'trigger_oss'
)
load(
@@ -228,8 +227,8 @@ def get_steps(edition, ver_mode):
integration_test_steps.extend([redis_integration_tests_step(edition=edition2, ver_mode=ver_mode), memcached_integration_tests_step(edition=edition2, ver_mode=ver_mode)])
if should_upload:
publish_steps.append(upload_cdn_step(edition=edition, ver_mode=ver_mode))
publish_steps.append(upload_packages_step(edition=edition, ver_mode=ver_mode))
publish_steps.append(upload_cdn_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss))
publish_steps.append(upload_packages_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss))
if should_publish:
publish_step = store_storybook_step(edition=edition, ver_mode=ver_mode)
build_npm_step = build_npm_packages_step(edition=edition, ver_mode=ver_mode)
@@ -433,7 +432,7 @@ def release_pipelines(ver_mode='release', trigger=None, environment=None):
},
'ref': ['refs/tags/v*',],
'repo': {
'exclude': ['grafana/grafana'],
'exclude': ['grafana/grafana'],
},
}