Build: Fix Redis/Memcached integration tests (#64298)
* Build: Fix integration cache tests * Allow REDIS_URL with scheme * Reduce cache integration tests timeout to 5m * Apply suggestion from code review * Run redis/memcached integration tests in OSS pipelines * Change redis image
This commit is contained in:
@@ -8,7 +8,7 @@ def integration_test_services_volumes():
|
||||
{"name": "mysql", "temp": {"medium": "memory"}},
|
||||
]
|
||||
|
||||
def integration_test_services(edition):
|
||||
def integration_test_services():
|
||||
services = [
|
||||
{
|
||||
"name": "postgres",
|
||||
@@ -34,24 +34,18 @@ def integration_test_services(edition):
|
||||
},
|
||||
"volumes": [{"name": "mysql", "path": "/var/lib/mysql"}],
|
||||
},
|
||||
{
|
||||
"name": "redis",
|
||||
"image": "redis:6.2.11-alpine",
|
||||
"environment": {},
|
||||
},
|
||||
{
|
||||
"name": "memcached",
|
||||
"image": "memcached:1.6.9-alpine",
|
||||
"environment": {},
|
||||
},
|
||||
]
|
||||
|
||||
if edition in ("enterprise", "enterprise2"):
|
||||
services.extend(
|
||||
[
|
||||
{
|
||||
"name": "redis",
|
||||
"image": "redis:6.2.1-alpine",
|
||||
"environment": {},
|
||||
},
|
||||
{
|
||||
"name": "memcached",
|
||||
"image": "memcached:1.6.9-alpine",
|
||||
"environment": {},
|
||||
},
|
||||
],
|
||||
)
|
||||
|
||||
return services
|
||||
|
||||
def ldap_service():
|
||||
|
||||
Reference in New Issue
Block a user