From 2b2373f6c2f202cb7b6f25f281ac7b148b69a81f Mon Sep 17 00:00:00 2001 From: mrsdizzie Date: Wed, 3 Jun 2020 15:07:02 -0400 Subject: [PATCH] Don't put integration test data outside of test folder (#11746) Some integration test data is being put outside of the integration test folders which means it isn't deleted properly with make clean. Update config so it works as expected. Co-authored-by: John Olheiser Co-authored-by: techknowlogick --- integrations/mssql.ini.tmpl | 15 ++++++++++----- integrations/mysql.ini.tmpl | 15 ++++++++++----- integrations/pgsql.ini.tmpl | 15 ++++++++++----- integrations/sqlite.ini.tmpl | 13 ++++++++++--- 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/integrations/mssql.ini.tmpl b/integrations/mssql.ini.tmpl index 063c41972..a8fbbe7fe 100644 --- a/integrations/mssql.ini.tmpl +++ b/integrations/mssql.ini.tmpl @@ -33,12 +33,15 @@ SSH_LISTEN_HOST = localhost SSH_PORT = 2201 START_SSH_SERVER = true LFS_START_SERVER = true -LFS_CONTENT_PATH = data/lfs-mssql +LFS_CONTENT_PATH = integrations/gitea-integration-mssql/data/lfs-mssql OFFLINE_MODE = false LFS_JWT_SECRET = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w APP_DATA_PATH = integrations/gitea-integration-mssql/data BUILTIN_SSH_SERVER_USER = git +[attachment] +PATH = integrations/gitea-integration-mssql/data + [mailer] ENABLED = true MAILER_TYPE = dummy @@ -56,12 +59,14 @@ NO_REPLY_ADDRESS = noreply.example.org ENABLE_NOTIFY_MAIL = true [picture] -DISABLE_GRAVATAR = false -ENABLE_FEDERATED_AVATAR = false +DISABLE_GRAVATAR = false +ENABLE_FEDERATED_AVATAR = false +AVATAR_UPLOAD_PATH = integrations/gitea-integration-mssql/data/avatars +REPOSITORY_AVATAR_UPLOAD_PATH = integrations/gitea-integration-mssql/data/repo-avatars [session] -PROVIDER = file -PROVIDER_CONFIG = data/sessions-mssql +PROVIDER = file +PROVIDER_CONFIG = integrations/gitea-integration-mssql/data/sessions [log] MODE = test,file diff --git a/integrations/mysql.ini.tmpl b/integrations/mysql.ini.tmpl index beff73660..012b0aef8 100644 --- a/integrations/mysql.ini.tmpl +++ b/integrations/mysql.ini.tmpl @@ -35,12 +35,15 @@ SSH_LISTEN_HOST = localhost SSH_PORT = 2201 START_SSH_SERVER = true LFS_START_SERVER = true -LFS_CONTENT_PATH = data/lfs-mysql +LFS_CONTENT_PATH = integrations/gitea-integration-mysql/datalfs-mysql OFFLINE_MODE = false LFS_JWT_SECRET = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w APP_DATA_PATH = integrations/gitea-integration-mysql/data BUILTIN_SSH_SERVER_USER = git +[attachment] +PATH = integrations/gitea-integration-mysql/data + [mailer] ENABLED = true MAILER_TYPE = dummy @@ -58,12 +61,14 @@ NO_REPLY_ADDRESS = noreply.example.org ENABLE_NOTIFY_MAIL = true [picture] -DISABLE_GRAVATAR = false -ENABLE_FEDERATED_AVATAR = false +DISABLE_GRAVATAR = false +ENABLE_FEDERATED_AVATAR = false +AVATAR_UPLOAD_PATH = integrations/gitea-integration-mysql/data/avatars +REPOSITORY_AVATAR_UPLOAD_PATH = integrations/gitea-integration-mysql/data/repo-avatars [session] -PROVIDER = file -PROVIDER_CONFIG = data/sessions-mysql +PROVIDER = file +PROVIDER_CONFIG = integrations/gitea-integration-mysql/data/sessions [log] MODE = test,file diff --git a/integrations/pgsql.ini.tmpl b/integrations/pgsql.ini.tmpl index 80258437e..4cac2585f 100644 --- a/integrations/pgsql.ini.tmpl +++ b/integrations/pgsql.ini.tmpl @@ -34,12 +34,15 @@ SSH_LISTEN_HOST = localhost SSH_PORT = 2202 START_SSH_SERVER = true LFS_START_SERVER = true -LFS_CONTENT_PATH = data/lfs-pgsql +LFS_CONTENT_PATH = integrations/gitea-integration-pgsql/data/lfs-pgsql OFFLINE_MODE = false LFS_JWT_SECRET = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w APP_DATA_PATH = integrations/gitea-integration-pgsql/data BUILTIN_SSH_SERVER_USER = git +[attachment] +PATH = integrations/gitea-integration-pgsql/data + [mailer] ENABLED = true MAILER_TYPE = dummy @@ -57,12 +60,14 @@ NO_REPLY_ADDRESS = noreply.example.org ENABLE_NOTIFY_MAIL = true [picture] -DISABLE_GRAVATAR = false -ENABLE_FEDERATED_AVATAR = false +DISABLE_GRAVATAR = false +ENABLE_FEDERATED_AVATAR = false +AVATAR_UPLOAD_PATH = integrations/gitea-integration-pgsql/data/avatars +REPOSITORY_AVATAR_UPLOAD_PATH = integrations/gitea-integration-pgsql/data/repo-avatars [session] -PROVIDER = file -PROVIDER_CONFIG = data/sessions-pgsql +PROVIDER = file +PROVIDER_CONFIG = integrations/gitea-integration-pgsql/data/sessions [log] MODE = test,file diff --git a/integrations/sqlite.ini.tmpl b/integrations/sqlite.ini.tmpl index 387368184..e899328c8 100644 --- a/integrations/sqlite.ini.tmpl +++ b/integrations/sqlite.ini.tmpl @@ -29,13 +29,16 @@ SSH_LISTEN_HOST = localhost SSH_PORT = 2203 START_SSH_SERVER = true LFS_START_SERVER = true -LFS_CONTENT_PATH = data/lfs-sqlite +LFS_CONTENT_PATH = integrations/gitea-integration-sqlite/data OFFLINE_MODE = false LFS_JWT_SECRET = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w APP_DATA_PATH = integrations/gitea-integration-sqlite/data ENABLE_GZIP = true BUILTIN_SSH_SERVER_USER = git +[attachment] +PATH = integrations/gitea-integration-sqlite/data + [mailer] ENABLED = true MAILER_TYPE = dummy @@ -52,11 +55,15 @@ DEFAULT_ALLOW_CREATE_ORGANIZATION = true NO_REPLY_ADDRESS = noreply.example.org [picture] -DISABLE_GRAVATAR = false -ENABLE_FEDERATED_AVATAR = false +DISABLE_GRAVATAR = false +ENABLE_FEDERATED_AVATAR = false +AVATAR_UPLOAD_PATH = integrations/gitea-integration-sqlite/data/avatars +REPOSITORY_AVATAR_UPLOAD_PATH = integrations/gitea-integration-sqlite/data/repo-avatars + [session] PROVIDER = file +PROVIDER_CONFIG = integrations/gitea-integration-sqlite/data/sessions [log] MODE = test,file