From f36a117eb67fc5e6109cfa101f316c8a3623c3c7 Mon Sep 17 00:00:00 2001 From: schnee Date: Mon, 13 Nov 2023 20:54:02 +0800 Subject: [PATCH] minor: resolve #1388 conversations --- .github/workflows/bk-user.yml | 2 ++ ...{0003_init_default_tenant.py => 0004_init_default_tenant.py} | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) rename src/bk-user/bkuser/apps/tenant/migrations/{0003_init_default_tenant.py => 0004_init_default_tenant.py} (98%) diff --git a/.github/workflows/bk-user.yml b/.github/workflows/bk-user.yml index a0eae0f07..cac608199 100644 --- a/.github/workflows/bk-user.yml +++ b/.github/workflows/bk-user.yml @@ -75,5 +75,7 @@ jobs: export BK_COMPONENT_API_URL="" export MYSQL_PASSWORD=root_pwd export MYSQL_HOST="127.0.0.1" + export INITIAL_ADMIN_USERNAME=admin + export INITIAL_ADMIN_PASSWORD=admin_pwd export DJANGO_SETTINGS_MODULE=bkuser.settings poetry run pytest ./tests diff --git a/src/bk-user/bkuser/apps/tenant/migrations/0003_init_default_tenant.py b/src/bk-user/bkuser/apps/tenant/migrations/0004_init_default_tenant.py similarity index 98% rename from src/bk-user/bkuser/apps/tenant/migrations/0003_init_default_tenant.py rename to src/bk-user/bkuser/apps/tenant/migrations/0004_init_default_tenant.py index 16f2f84bd..0dd0f7bcb 100644 --- a/src/bk-user/bkuser/apps/tenant/migrations/0003_init_default_tenant.py +++ b/src/bk-user/bkuser/apps/tenant/migrations/0004_init_default_tenant.py @@ -70,7 +70,7 @@ def forwards_func(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ("tenant", "0002_init_builtin_user_fields"), + ("tenant", "0003_auto_20231113_2017"), ] operations = [migrations.RunPython(forwards_func)]