IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove enterprise2 condition - move tests to release pipelines (#51096)

Browse Source
This commit is contained in:
Dimitris Sotirakis 2022-06-21 15:44:51 +03:00 committed by GitHub
parent b219fe3f9e
commit f351b9a923
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/drone/pipelines/release.star
View File

@ -220,9 +220,6 @@ def get_steps(edition, ver_mode):
if build_storybook: if build_storybook:
build_steps.append(build_storybook) build_steps.append(build_storybook)
if include_enterprise2:
integration_test_steps.extend([redis_integration_tests_step(), memcached_integration_tests_step()])
if should_upload: if should_upload:
publish_steps.append(upload_cdn_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss)) 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)) publish_steps.append(upload_packages_step(edition=edition, ver_mode=ver_mode, trigger=trigger_oss))
@ -337,7 +334,7 @@ def get_enterprise_pipelines(trigger, ver_mode):
), ),
pipeline( pipeline(
name='{}-enterprise-integration-tests'.format(ver_mode), edition=edition, trigger=trigger, services=services, name='{}-enterprise-integration-tests'.format(ver_mode), edition=edition, trigger=trigger, services=services,
steps=[download_grabpl_step(), identify_runner_step(), clone_enterprise_step(ver_mode), init_enterprise_step(ver_mode),] + integration_test_steps, steps=[download_grabpl_step(), identify_runner_step(), clone_enterprise_step(ver_mode), init_enterprise_step(ver_mode),] + integration_test_steps + [redis_integration_tests_step(), memcached_integration_tests_step()],
volumes=volumes, volumes=volumes,
), ),
]) ])

8
scripts/drone/steps/lib.star
View File

@ -927,12 +927,10 @@ def mysql_integration_tests_step(edition, ver_mode):
def redis_integration_tests_step(): def redis_integration_tests_step():
deps = []
deps.extend(['grabpl'])
return { return {
'name': 'redis-integration-tests', 'name': 'redis-integration-tests',
'image': build_image, 'image': build_image,
'depends_on': deps, 'depends_on': ['init-enterprise'],
'environment': { 'environment': {
'REDIS_URL': 'redis://redis:6379/0', 'REDIS_URL': 'redis://redis:6379/0',
}, },
@ -944,12 +942,10 @@ def redis_integration_tests_step():
def memcached_integration_tests_step(): def memcached_integration_tests_step():
deps = []
deps.extend(['grabpl'])
return { return {
'name': 'memcached-integration-tests', 'name': 'memcached-integration-tests',
'image': build_image, 'image': build_image,
'depends_on': deps, 'depends_on': ['init-enterprise'],
'environment': { 'environment': {
'MEMCACHED_HOSTS': 'memcached:11211', 'MEMCACHED_HOSTS': 'memcached:11211',
}, },