CI: Update CI/CD tooling and pipelines from main (#76814)

* CI: Update CI/CD tooling and pipelines from main

* Update Makefile

* Comment out validate_openapi_spec_step

* Update broken frontend tests

* Fix validate-npm-packages regex to work without suffix

* Fix cypress image version
This commit is contained in:
Guilherme Caulada
2023-10-19 17:02:22 -03:00
committed by GitHub
parent 8757cb124b
commit 03ecb1db39
46 changed files with 2237 additions and 2858 deletions
+12 -6
View File
@@ -18,7 +18,7 @@ def integration_test_services():
services = [
{
"name": "postgres",
"image": images["postgres_alpine_image"],
"image": images["postgres_alpine"],
"environment": {
"POSTGRES_USER": "grafanatest",
"POSTGRES_PASSWORD": "grafanatest",
@@ -31,7 +31,7 @@ def integration_test_services():
},
{
"name": "mysql57",
"image": images["mysql5_image"],
"image": images["mysql5"],
"environment": {
"MYSQL_ROOT_PASSWORD": "rootpass",
"MYSQL_DATABASE": "grafana_tests",
@@ -43,7 +43,7 @@ def integration_test_services():
},
{
"name": "mysql80",
"image": images["mysql8_image"],
"image": images["mysql8"],
"environment": {
"MYSQL_ROOT_PASSWORD": "rootpass",
"MYSQL_DATABASE": "grafana_tests",
@@ -53,14 +53,20 @@ def integration_test_services():
"volumes": [{"name": "mysql80", "path": "/var/lib/mysql"}],
"commands": ["docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"],
},
{
"name": "mimir_backend",
"image": images["mimir"],
"environment": {},
"commands": ["/bin/mimir -target=backend"],
},
{
"name": "redis",
"image": images["redis_alpine_image"],
"image": images["redis_alpine"],
"environment": {},
},
{
"name": "memcached",
"image": images["memcached_alpine_image"],
"image": images["memcached_alpine"],
"environment": {},
},
]
@@ -70,7 +76,7 @@ def integration_test_services():
def ldap_service():
return {
"name": "ldap",
"image": images["openldap_image"],
"image": images["openldap"],
"environment": {
"LDAP_ADMIN_PASSWORD": "grafana",
"LDAP_DOMAIN": "grafana.org",