From dac01a0cd8b1be74c77dd719d06ac5021a0cee2c Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Wed, 15 Jun 2022 13:36:52 +0300 Subject: [PATCH] Rename release pipelines (#50585) (#50594) (cherry picked from commit 5633648383a3e41ee75f80766b907436562d808f) --- .drone.yml | 58 ++++++++++++++-------------- scripts/drone/pipelines/release.star | 28 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3e95e3fd18c..4003b6e8b3a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1493,7 +1493,7 @@ type: docker --- depends_on: [] kind: pipeline -name: oss-build-e2e-publish-release +name: release-oss-build-e2e-publish node: type: no-parallel platform: @@ -1799,7 +1799,7 @@ volumes: --- depends_on: [] kind: pipeline -name: oss-test-release +name: release-oss-test node: type: no-parallel platform: @@ -1907,7 +1907,7 @@ volumes: --- depends_on: [] kind: pipeline -name: oss-integration-tests-release +name: release-oss-integration-tests node: type: no-parallel platform: @@ -1997,11 +1997,11 @@ volumes: medium: memory --- depends_on: -- oss-build-e2e-publish-release -- oss-test-release -- oss-integration-tests-release +- release-oss-build-e2e-publish +- release-oss-test +- release-oss-integration-tests kind: pipeline -name: oss-windows-release +name: release-oss-windows platform: arch: amd64 os: windows @@ -2063,7 +2063,7 @@ depends_on: [] image_pull_secrets: - dockerconfigjson kind: pipeline -name: enterprise-build-e2e-publish-release +name: release-enterprise-build-e2e-publish node: type: no-parallel platform: @@ -2420,7 +2420,7 @@ depends_on: [] image_pull_secrets: - dockerconfigjson kind: pipeline -name: enterprise-test-release +name: release-enterprise-test node: type: no-parallel platform: @@ -2573,7 +2573,7 @@ depends_on: [] image_pull_secrets: - dockerconfigjson kind: pipeline -name: enterprise-integration-tests-release +name: release-enterprise-integration-tests node: type: no-parallel platform: @@ -2714,13 +2714,13 @@ volumes: clone: disable: true depends_on: -- enterprise-build-e2e-publish-release -- enterprise-test-release -- enterprise-integration-tests-release +- release-enterprise-build-e2e-publish +- release-enterprise-test +- release-enterprise-integration-tests image_pull_secrets: - dockerconfigjson kind: pipeline -name: enterprise-windows-release +name: release-enterprise-windows platform: arch: amd64 os: windows @@ -3303,7 +3303,7 @@ volumes: --- depends_on: [] kind: pipeline -name: oss-build-e2e-publish-release-branch +name: release-branch-oss-build-e2e-publish node: type: no-parallel platform: @@ -3579,7 +3579,7 @@ volumes: --- depends_on: [] kind: pipeline -name: oss-test-release-branch +name: release-branch-oss-test node: type: no-parallel platform: @@ -3681,7 +3681,7 @@ volumes: --- depends_on: [] kind: pipeline -name: oss-integration-tests-release-branch +name: release-branch-oss-integration-tests node: type: no-parallel platform: @@ -3765,11 +3765,11 @@ volumes: medium: memory --- depends_on: -- oss-build-e2e-publish-release-branch -- oss-test-release-branch -- oss-integration-tests-release-branch +- release-branch-oss-build-e2e-publish +- release-branch-oss-test +- release-branch-oss-integration-tests kind: pipeline -name: oss-windows-release-branch +name: release-branch-oss-windows platform: arch: amd64 os: windows @@ -3820,7 +3820,7 @@ depends_on: [] image_pull_secrets: - dockerconfigjson kind: pipeline -name: enterprise-build-e2e-publish-release-branch +name: release-branch-enterprise-build-e2e-publish node: type: no-parallel platform: @@ -4175,7 +4175,7 @@ depends_on: [] image_pull_secrets: - dockerconfigjson kind: pipeline -name: enterprise-test-release-branch +name: release-branch-enterprise-test node: type: no-parallel platform: @@ -4319,7 +4319,7 @@ depends_on: [] image_pull_secrets: - dockerconfigjson kind: pipeline -name: enterprise-integration-tests-release-branch +name: release-branch-enterprise-integration-tests node: type: no-parallel platform: @@ -4451,13 +4451,13 @@ volumes: clone: disable: true depends_on: -- enterprise-build-e2e-publish-release-branch -- enterprise-test-release-branch -- enterprise-integration-tests-release-branch +- release-branch-enterprise-build-e2e-publish +- release-branch-enterprise-test +- release-branch-enterprise-integration-tests image_pull_secrets: - dockerconfigjson kind: pipeline -name: enterprise-windows-release-branch +name: release-branch-enterprise-windows platform: arch: amd64 os: windows @@ -4667,6 +4667,6 @@ kind: secret name: gcp_upload_artifacts_key --- kind: signature -hmac: 1a18574b924be58b3568339b9e40a4fc926aa92d748b7e15c95919169e364a9f +hmac: 9225ad54ce9cda12db965a6f098eb4daf970c4d43a0f456b8c5f1aff81ac2abd ... diff --git a/scripts/drone/pipelines/release.star b/scripts/drone/pipelines/release.star index e85610016b5..6d46edbbe3f 100644 --- a/scripts/drone/pipelines/release.star +++ b/scripts/drone/pipelines/release.star @@ -256,7 +256,7 @@ def get_oss_pipelines(trigger, ver_mode): volumes = integration_test_services_volumes() init_steps, test_steps, build_steps, integration_test_steps, package_steps, windows_package_steps, publish_steps = get_steps(edition=edition, ver_mode=ver_mode) windows_pipeline = pipeline( - name='oss-windows-{}'.format(ver_mode), edition=edition, trigger=trigger, + name='{}-oss-windows'.format(ver_mode), edition=edition, trigger=trigger, steps=[identify_runner_step('windows')] + windows_package_steps, platform='windows', depends_on=[ 'oss-build{}-publish-{}'.format(get_e2e_suffix(), ver_mode), @@ -264,7 +264,7 @@ def get_oss_pipelines(trigger, ver_mode): ) pipelines = [ pipeline( - name='oss-build{}-publish-{}'.format(get_e2e_suffix(), ver_mode), edition=edition, trigger=trigger, services=[], + name='{}-oss-build{}-publish'.format(ver_mode, get_e2e_suffix()), edition=edition, trigger=trigger, services=[], steps=init_steps + build_steps + package_steps + publish_steps, volumes=volumes, ), @@ -272,21 +272,21 @@ def get_oss_pipelines(trigger, ver_mode): if not disable_tests: pipelines.extend([ pipeline( - name='oss-test-{}'.format(ver_mode), edition=edition, trigger=trigger, services=[], + name='{}-oss-test'.format(ver_mode), edition=edition, trigger=trigger, services=[], steps=init_steps + test_steps, volumes=[], ), pipeline( - name='oss-integration-tests-{}'.format(ver_mode), edition=edition, trigger=trigger, services=services, + name='{}-oss-integration-tests'.format(ver_mode), edition=edition, trigger=trigger, services=services, steps=[download_grabpl_step(), identify_runner_step(),] + integration_test_steps, volumes=volumes, ) ]) deps = { 'depends_on': [ - 'oss-build{}-publish-{}'.format(get_e2e_suffix(), ver_mode), - 'oss-test-{}'.format(ver_mode), - 'oss-integration-tests-{}'.format(ver_mode) + '{}-oss-build{}-publish'.format(ver_mode, get_e2e_suffix()), + '{}-oss-test'.format(ver_mode), + '{}-oss-integration-tests'.format(ver_mode) ] } windows_pipeline.update(deps) @@ -318,7 +318,7 @@ def get_enterprise_pipelines(trigger, ver_mode): step.update(deps_on_clone_enterprise_step) windows_pipeline = pipeline( - name='enterprise-windows-{}'.format(ver_mode), edition=edition, trigger=trigger, + name='{}-enterprise-windows'.format(ver_mode), edition=edition, trigger=trigger, steps=[identify_runner_step('windows')] + windows_package_steps, platform='windows', depends_on=[ 'enterprise-build{}-publish-{}'.format(get_e2e_suffix(), ver_mode), @@ -326,7 +326,7 @@ def get_enterprise_pipelines(trigger, ver_mode): ) pipelines = [ pipeline( - name='enterprise-build{}-publish-{}'.format(get_e2e_suffix(), ver_mode), edition=edition, trigger=trigger, services=[], + name='{}-enterprise-build{}-publish'.format(ver_mode, get_e2e_suffix()), edition=edition, trigger=trigger, services=[], steps=init_steps + build_steps + package_steps + publish_steps, volumes=volumes, ), @@ -334,21 +334,21 @@ def get_enterprise_pipelines(trigger, ver_mode): if not disable_tests: pipelines.extend([ pipeline( - name='enterprise-test-{}'.format(ver_mode), edition=edition, trigger=trigger, services=[], + name='{}-enterprise-test'.format(ver_mode), edition=edition, trigger=trigger, services=[], steps=init_steps + test_steps, volumes=[], ), 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, volumes=volumes, ), ]) deps = { 'depends_on': [ - 'enterprise-build{}-publish-{}'.format(get_e2e_suffix(), ver_mode), - 'enterprise-test-{}'.format(ver_mode), - 'enterprise-integration-tests-{}'.format(ver_mode) + '{}-enterprise-build{}-publish'.format(ver_mode, get_e2e_suffix()), + '{}-enterprise-test'.format(ver_mode), + '{}-enterprise-integration-tests'.format(ver_mode) ] } windows_pipeline.update(deps)