@@ -290,12 +290,20 @@ def publish_storybook_step(edition, ver_mode):
|
||||
|
||||
|
||||
def upload_cdn_step(edition):
|
||||
deps = []
|
||||
if edition in 'enterprise2':
|
||||
deps.extend([
|
||||
'package' + enterprise2_suffix(edition),
|
||||
])
|
||||
else:
|
||||
deps.extend([
|
||||
'end-to-end-tests-server',
|
||||
])
|
||||
|
||||
return {
|
||||
'name': 'upload-cdn-assets' + enterprise2_suffix(edition),
|
||||
'image': publish_image,
|
||||
'depends_on': [
|
||||
'end-to-end-tests-server' + enterprise2_suffix(edition),
|
||||
],
|
||||
'depends_on': deps,
|
||||
'environment': {
|
||||
'GCP_GRAFANA_UPLOAD_KEY': from_secret('gcp_key'),
|
||||
'PRERELEASE_BUCKET': from_secret(prerelease_bucket)
|
||||
@@ -919,21 +927,27 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
|
||||
else:
|
||||
cmd = './bin/grabpl upload-packages --edition {}{}'.format(edition, packages_bucket)
|
||||
|
||||
dependencies = [
|
||||
'end-to-end-tests-dashboards-suite' + enterprise2_suffix(edition),
|
||||
'end-to-end-tests-panels-suite' + enterprise2_suffix(edition),
|
||||
'end-to-end-tests-smoke-tests-suite' + enterprise2_suffix(edition),
|
||||
'end-to-end-tests-various-suite' + enterprise2_suffix(edition),
|
||||
]
|
||||
deps = []
|
||||
if edition in 'enterprise2':
|
||||
deps.extend([
|
||||
'package' + enterprise2_suffix(edition),
|
||||
])
|
||||
else:
|
||||
deps.extend([
|
||||
'end-to-end-tests-dashboards-suite' + enterprise2_suffix(edition),
|
||||
'end-to-end-tests-panels-suite' + enterprise2_suffix(edition),
|
||||
'end-to-end-tests-smoke-tests-suite' + enterprise2_suffix(edition),
|
||||
'end-to-end-tests-various-suite' + enterprise2_suffix(edition),
|
||||
])
|
||||
|
||||
if edition in ('enterprise', 'enterprise2'):
|
||||
dependencies.append('redis-integration-tests')
|
||||
dependencies.append('memcached-integration-tests')
|
||||
deps.append('redis-integration-tests')
|
||||
deps.append('memcached-integration-tests')
|
||||
|
||||
return {
|
||||
'name': 'upload-packages' + enterprise2_suffix(edition),
|
||||
'image': publish_image,
|
||||
'depends_on': dependencies,
|
||||
'depends_on': deps,
|
||||
'environment': {
|
||||
'GCP_GRAFANA_UPLOAD_KEY': from_secret('gcp_key'),
|
||||
'PRERELEASE_BUCKET': from_secret('prerelease_bucket'),
|
||||
|
||||
Reference in New Issue
Block a user