add memcached integration test steps in starlark (#32729)
* add memcached integration test steps to starlark * typo
This commit is contained in:
+24
-2
@@ -816,6 +816,23 @@ def redis_integration_tests_step():
|
||||
],
|
||||
}
|
||||
|
||||
def memcached_integration_tests_step():
|
||||
return {
|
||||
'name': 'memcached-integration-tests',
|
||||
'image': build_image,
|
||||
'depends_on': [
|
||||
'test-backend',
|
||||
'test-frontend',
|
||||
],
|
||||
'environment': {
|
||||
'MEMCACHED_HOSTS': 'memcached:11211',
|
||||
},
|
||||
'commands': [
|
||||
'./bin/dockerize -wait tcp://memcached:11211 -timeout 120s',
|
||||
'./bin/grabpl integration-tests',
|
||||
],
|
||||
}
|
||||
|
||||
def release_canary_npm_packages_step(edition):
|
||||
if edition in ('enterprise', 'enterprise2'):
|
||||
return None
|
||||
@@ -882,6 +899,7 @@ def upload_packages_step(edition, ver_mode, is_downstream=False):
|
||||
|
||||
if edition in ('enterprise', 'enterprise2'):
|
||||
dependencies.append('redis-integration-tests')
|
||||
dependencies.append('memcached-integration-tests')
|
||||
|
||||
return {
|
||||
'name': 'upload-packages' + enterprise2_sfx(edition),
|
||||
@@ -1093,10 +1111,14 @@ def integration_test_services(edition):
|
||||
]
|
||||
|
||||
if edition in ('enterprise', 'enterprise2'):
|
||||
services.append({
|
||||
services.extend([{
|
||||
'name': 'redis',
|
||||
'image': 'redis:6.2.1-alpine',
|
||||
'environment': {},
|
||||
})
|
||||
}, {
|
||||
'name': 'memcached',
|
||||
'image': 'memcached:1.6.9-alpine',
|
||||
'environment': {},
|
||||
}])
|
||||
|
||||
return services
|
||||
|
||||
+2
-1
@@ -21,6 +21,7 @@ load(
|
||||
'postgres_integration_tests_step',
|
||||
'mysql_integration_tests_step',
|
||||
'redis_integration_tests_step',
|
||||
'memcached_integration_tests_step',
|
||||
'get_windows_steps',
|
||||
'benchmark_ldap_step',
|
||||
'ldap_service',
|
||||
@@ -81,7 +82,7 @@ def get_steps(edition, is_downstream=False):
|
||||
])
|
||||
|
||||
if include_enterprise2:
|
||||
steps.append(redis_integration_tests_step())
|
||||
steps.extend([redis_integration_tests_step(), memcached_integration_tests_step()])
|
||||
|
||||
steps.extend([
|
||||
release_canary_npm_packages_step(edition),
|
||||
|
||||
@@ -22,6 +22,7 @@ load(
|
||||
'postgres_integration_tests_step',
|
||||
'mysql_integration_tests_step',
|
||||
'redis_integration_tests_step',
|
||||
'memcached_integration_tests_step',
|
||||
'benchmark_ldap_step',
|
||||
'ldap_service',
|
||||
'integration_test_services',
|
||||
@@ -74,6 +75,7 @@ def pr_pipelines(edition):
|
||||
if include_enterprise2:
|
||||
steps.extend([
|
||||
redis_integration_tests_step(),
|
||||
memcached_integration_tests_step(),
|
||||
package_step(edition=edition2, ver_mode=ver_mode, variants=['linux-x64']),
|
||||
e2e_tests_server_step(edition=edition2, port=3002),
|
||||
e2e_tests_step(edition=edition2, port=3002),
|
||||
|
||||
@@ -23,6 +23,7 @@ load(
|
||||
'postgres_integration_tests_step',
|
||||
'mysql_integration_tests_step',
|
||||
'redis_integration_tests_step',
|
||||
'memcached_integration_tests_step',
|
||||
'get_windows_steps',
|
||||
'benchmark_ldap_step',
|
||||
'ldap_service',
|
||||
@@ -103,7 +104,7 @@ def get_steps(edition, ver_mode):
|
||||
])
|
||||
|
||||
if include_enterprise2:
|
||||
steps.append(redis_integration_tests_step())
|
||||
steps.extend([redis_integration_tests_step(), memcached_integration_tests_step()])
|
||||
|
||||
if should_upload:
|
||||
steps.append(upload_cdn(edition=edition))
|
||||
|
||||
Reference in New Issue
Block a user