Add edition as environment var (#56069) (#56238)

(cherry picked from commit 8eea6f7f4f)
This commit is contained in:
Dimitris Sotirakis
2022-10-04 03:58:16 -04:00
committed by GitHub
parent f7d85ba844
commit 04c5b2b9cc
2 changed files with 43 additions and 9 deletions
+33 -1
View File
@@ -1922,6 +1922,8 @@ type: docker
clone:
retries: 3
depends_on: []
environment:
EDITION: OSS
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -2230,6 +2232,8 @@ volumes:
clone:
retries: 3
depends_on: []
environment:
EDITION: OSS
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -2337,6 +2341,8 @@ volumes:
clone:
retries: 3
depends_on: []
environment:
EDITION: OSS
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -2452,6 +2458,8 @@ depends_on:
- release-oss-build-e2e-publish
- release-oss-test
- release-oss-integration-tests
environment:
EDITION: OSS
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -2513,6 +2521,8 @@ volumes:
clone:
disable: true
depends_on: []
environment:
EDITION: ENTERPRISE
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -2861,6 +2871,8 @@ volumes:
clone:
disable: true
depends_on: []
environment:
EDITION: ENTERPRISE
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -3010,6 +3022,8 @@ volumes:
clone:
disable: true
depends_on: []
environment:
EDITION: ENTERPRISE
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -3175,6 +3189,8 @@ depends_on:
- release-enterprise-build-e2e-publish
- release-enterprise-test
- release-enterprise-integration-tests
environment:
EDITION: ENTERPRISE
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -3921,6 +3937,8 @@ volumes:
clone:
retries: 3
depends_on: []
environment:
EDITION: OSS
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -4198,6 +4216,8 @@ volumes:
clone:
retries: 3
depends_on: []
environment:
EDITION: OSS
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -4299,6 +4319,8 @@ volumes:
clone:
retries: 3
depends_on: []
environment:
EDITION: OSS
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -4408,6 +4430,8 @@ depends_on:
- release-branch-oss-build-e2e-publish
- release-branch-oss-test
- release-branch-oss-integration-tests
environment:
EDITION: OSS
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -4459,6 +4483,8 @@ volumes:
clone:
disable: true
depends_on: []
environment:
EDITION: ENTERPRISE
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -4796,6 +4822,8 @@ volumes:
clone:
disable: true
depends_on: []
environment:
EDITION: ENTERPRISE
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -4936,6 +4964,8 @@ volumes:
clone:
disable: true
depends_on: []
environment:
EDITION: ENTERPRISE
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -5092,6 +5122,8 @@ depends_on:
- release-branch-enterprise-build-e2e-publish
- release-branch-enterprise-test
- release-branch-enterprise-integration-tests
environment:
EDITION: ENTERPRISE
image_pull_secrets:
- dockerconfigjson
kind: pipeline
@@ -5349,6 +5381,6 @@ kind: secret
name: packages_secret_access_key
---
kind: signature
hmac: 88244e8abc706fc4a5c08b37152198afdd406bcd93366c4c07195f5eab242f70
hmac: f97c0e6742fbcb3c0369652bc1570242cf1083fb2b7fdac76b66f719ecd2b5e0
...
+10 -8
View File
@@ -153,6 +153,7 @@ def publish_image_pipelines(mode):
),]
def get_oss_pipelines(trigger, ver_mode):
environment = {'EDITION': 'OSS'}
edition = 'oss'
services = integration_test_services(edition=edition)
volumes = integration_test_services_volumes()
@@ -230,13 +231,13 @@ def get_oss_pipelines(trigger, ver_mode):
steps=[identify_runner_step('windows')] + windows_package_steps,
platform='windows', depends_on=[
'oss-build{}-publish-{}'.format(get_e2e_suffix(), ver_mode),
],
], environment=environment,
)
pipelines = [
pipeline(
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,
environment=environment, volumes=volumes,
),
]
if not disable_tests:
@@ -244,12 +245,12 @@ def get_oss_pipelines(trigger, ver_mode):
pipeline(
name='{}-oss-test'.format(ver_mode), edition=edition, trigger=trigger, services=[],
steps=init_steps + test_steps,
volumes=[],
environment=environment, volumes=[],
),
pipeline(
name='{}-oss-integration-tests'.format(ver_mode), edition=edition, trigger=trigger, services=services,
steps=[download_grabpl_step(), identify_runner_step(), verify_gen_cue_step(edition), wire_install_step(), ] + integration_test_steps,
volumes=volumes,
environment=environment, volumes=volumes,
)
])
deps = {
@@ -265,6 +266,7 @@ def get_oss_pipelines(trigger, ver_mode):
return pipelines
def get_enterprise_pipelines(trigger, ver_mode):
environment = {'EDITION': 'ENTERPRISE'}
edition = 'enterprise'
services = integration_test_services(edition=edition)
volumes = integration_test_services_volumes()
@@ -371,12 +373,12 @@ def get_enterprise_pipelines(trigger, ver_mode):
steps=[identify_runner_step('windows')] + windows_package_steps,
platform='windows', depends_on=[
'enterprise-build{}-publish-{}'.format(get_e2e_suffix(), ver_mode),
],
], environment=environment,
)
pipelines = [
pipeline(
name='{}-enterprise-build{}-publish'.format(ver_mode, get_e2e_suffix()), edition=edition, trigger=trigger, services=[],
steps=init_steps + build_steps + package_steps + publish_steps,
steps=init_steps + build_steps + package_steps + publish_steps, environment=environment,
volumes=volumes,
),
]
@@ -384,13 +386,13 @@ def get_enterprise_pipelines(trigger, ver_mode):
pipelines.extend([
pipeline(
name='{}-enterprise-test'.format(ver_mode), edition=edition, trigger=trigger, services=[],
steps=init_steps + test_steps,
steps=init_steps + test_steps, environment=environment,
volumes=[],
),
pipeline(
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), verify_gen_cue_step(edition), wire_install_step()] + integration_test_steps + [redis_integration_tests_step(), memcached_integration_tests_step()],
volumes=volumes,
environment=environment, volumes=volumes,
),
])
deps = {