Build pipeline: Cleanup build-main pipeline steps (#38484)
* Refactor dependencies * Regenerate drone.yml * Reorder steps in starlark files * Make build depend on test * Make test steps depend on lint * Make gen-version step depend on build steps * Refactor step dependencies * Move e2e-tests step before upload_cdn * Sync with main
This commit is contained in:
+1
-4
@@ -320,7 +320,7 @@ def upload_cdn(edition):
|
||||
'name': 'upload-cdn-assets' + enterprise2_sfx(edition),
|
||||
'image': publish_image,
|
||||
'depends_on': [
|
||||
'package' + enterprise2_sfx(edition),
|
||||
'end-to-end-tests-server' + enterprise2_sfx(edition),
|
||||
],
|
||||
'environment': {
|
||||
'GCP_GRAFANA_UPLOAD_KEY': from_secret('gcp_key'),
|
||||
@@ -829,7 +829,6 @@ def release_canary_npm_packages_step(edition):
|
||||
'image': build_image,
|
||||
'depends_on': [
|
||||
'end-to-end-tests',
|
||||
'end-to-end-tests-server',
|
||||
],
|
||||
'environment': {
|
||||
'GITHUB_PACKAGE_TOKEN': from_secret('github_package_token'),
|
||||
@@ -877,9 +876,7 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
|
||||
cmd = './bin/grabpl upload-packages --edition {}{}'.format(edition, packages_bucket)
|
||||
|
||||
dependencies = [
|
||||
'package' + enterprise2_sfx(edition),
|
||||
'end-to-end-tests' + enterprise2_sfx(edition),
|
||||
'end-to-end-tests-server',
|
||||
'mysql-integration-tests',
|
||||
'postgres-integration-tests',
|
||||
]
|
||||
|
||||
@@ -123,9 +123,9 @@ def get_steps(edition, ver_mode):
|
||||
edition2 = 'enterprise2'
|
||||
steps.extend([
|
||||
package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
|
||||
upload_cdn(edition=edition2),
|
||||
e2e_tests_server_step(edition=edition2, port=3002),
|
||||
e2e_tests_step(edition=edition2, port=3002, tries=3),
|
||||
upload_cdn(edition=edition2),
|
||||
])
|
||||
if should_upload:
|
||||
steps.append(upload_packages_step(edition=edition2, ver_mode=ver_mode))
|
||||
|
||||
Reference in New Issue
Block a user