Build: Drone starlark file cleanup (#59919)

* format drone starlark files with black

* clean up unused params

* more simplification

* more cleanup

* more cleanup
This commit is contained in:
Dan Cech
2022-12-07 09:13:57 +02:00
committed by GitHub
parent d0eeff2fa0
commit 440d8a3d88
23 changed files with 1449 additions and 1021 deletions
+30 -27
View File
@@ -1,8 +1,9 @@
def integration_test_services_volumes():
return [
{ 'name': 'postgres', 'temp': { 'medium': 'memory' } },
{ 'name': 'mysql', 'temp': { 'medium': 'memory' }
}]
{'name': 'postgres', 'temp': {'medium': 'memory'}},
{'name': 'mysql', 'temp': {'medium': 'memory'}},
]
def integration_test_services(edition):
services = [
@@ -10,15 +11,14 @@ def integration_test_services(edition):
'name': 'postgres',
'image': 'postgres:12.3-alpine',
'environment': {
'POSTGRES_USER': 'grafanatest',
'POSTGRES_PASSWORD': 'grafanatest',
'POSTGRES_DB': 'grafanatest',
'PGDATA': '/var/lib/postgresql/data/pgdata',
'POSTGRES_USER': 'grafanatest',
'POSTGRES_PASSWORD': 'grafanatest',
'POSTGRES_DB': 'grafanatest',
'PGDATA': '/var/lib/postgresql/data/pgdata',
},
'volumes': [{
'name': 'postgres',
'path': '/var/lib/postgresql/data/pgdata'
}],
'volumes': [
{'name': 'postgres', 'path': '/var/lib/postgresql/data/pgdata'}
],
},
{
'name': 'mysql',
@@ -29,33 +29,36 @@ def integration_test_services(edition):
'MYSQL_USER': 'grafana',
'MYSQL_PASSWORD': 'password',
},
'volumes': [{
'name': 'mysql',
'path': '/var/lib/mysql'
}]
'volumes': [{'name': 'mysql', 'path': '/var/lib/mysql'}],
},
]
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': {},
}])
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():
return {
'name': 'ldap',
'image': 'osixia/openldap:1.4.0',
'environment': {
'LDAP_ADMIN_PASSWORD': 'grafana',
'LDAP_DOMAIN': 'grafana.org',
'SLAPD_ADDITIONAL_MODULES': 'memberof',
'LDAP_ADMIN_PASSWORD': 'grafana',
'LDAP_DOMAIN': 'grafana.org',
'SLAPD_ADDITIONAL_MODULES': 'memberof',
},
}