From c1cc1b06ec7dc9c968a5abe5de3f2e3062e8a92e Mon Sep 17 00:00:00 2001 From: James Tanner Date: Mon, 10 Jun 2024 19:15:20 -0400 Subject: [PATCH 1/2] Use dab checkout. No-Issue Signed-off-by: James Tanner --- dev/oci_env_integration/oci_env_configs/dab.compose.env | 2 +- dev/oci_env_integration/oci_env_configs/dab_jwt.compose.env | 2 +- dev/oci_env_integration/oci_env_configs/standalone.compose.env | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/oci_env_integration/oci_env_configs/dab.compose.env b/dev/oci_env_integration/oci_env_configs/dab.compose.env index ff1c669324..bc79dfe2ab 100644 --- a/dev/oci_env_integration/oci_env_configs/dab.compose.env +++ b/dev/oci_env_integration/oci_env_configs/dab.compose.env @@ -1,7 +1,7 @@ COMPOSE_PROFILE=galaxy_ng/base:galaxy_ng/dab COMPOSE_PROJECT_NAME=ci-dab -DEV_SOURCE_PATH=galaxy_ng +DEV_SOURCE_PATH=galaxy_ng:django-ansible-base COMPOSE_BINARY=docker SETUP_TEST_DATA=1 UPDATE_UI=0 diff --git a/dev/oci_env_integration/oci_env_configs/dab_jwt.compose.env b/dev/oci_env_integration/oci_env_configs/dab_jwt.compose.env index 68d92b67ea..30fa74f61a 100644 --- a/dev/oci_env_integration/oci_env_configs/dab_jwt.compose.env +++ b/dev/oci_env_integration/oci_env_configs/dab_jwt.compose.env @@ -1,7 +1,7 @@ COMPOSE_PROFILE=galaxy_ng/base:galaxy_ng/dab_jwt COMPOSE_PROJECT_NAME=ci-dab-proxy -DEV_SOURCE_PATH=galaxy_ng +DEV_SOURCE_PATH=galaxy_ng:django-ansible-base COMPOSE_BINARY=docker SETUP_TEST_DATA=0 UPDATE_UI=0 diff --git a/dev/oci_env_integration/oci_env_configs/standalone.compose.env b/dev/oci_env_integration/oci_env_configs/standalone.compose.env index 3a3de45d77..571871a8cb 100644 --- a/dev/oci_env_integration/oci_env_configs/standalone.compose.env +++ b/dev/oci_env_integration/oci_env_configs/standalone.compose.env @@ -1,7 +1,7 @@ COMPOSE_PROFILE=galaxy_ng/base COMPOSE_PROJECT_NAME=ci-standalone -DEV_SOURCE_PATH=galaxy_ng +DEV_SOURCE_PATH=galaxy_ng:django-ansible-base COMPOSE_BINARY=docker SETUP_TEST_DATA=1 UPDATE_UI=0 From eb18e031cdc267de0c98815453f34756982e3f2f Mon Sep 17 00:00:00 2001 From: James Tanner Date: Mon, 10 Jun 2024 19:46:26 -0400 Subject: [PATCH 2/2] Re-add dab to installed apps by default. No-Issue Signed-off-by: James Tanner --- dev/oci_env_integration/oci_env_configs/community.compose.env | 2 +- galaxy_ng/app/dynaconf_hooks.py | 3 +-- galaxy_ng/app/settings.py | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/oci_env_integration/oci_env_configs/community.compose.env b/dev/oci_env_integration/oci_env_configs/community.compose.env index 162c510e55..4a9fbd0bd9 100644 --- a/dev/oci_env_integration/oci_env_configs/community.compose.env +++ b/dev/oci_env_integration/oci_env_configs/community.compose.env @@ -1,7 +1,7 @@ COMPOSE_PROFILE=galaxy_ng/base:galaxy_ng/community:pminio COMPOSE_PROJECT_NAME=ci-community -DEV_SOURCE_PATH=galaxy_ng +DEV_SOURCE_PATH=galaxy_ng:django-ansible-base COMPOSE_BINARY=docker SETUP_TEST_DATA=1 UPDATE_UI=0 diff --git a/galaxy_ng/app/dynaconf_hooks.py b/galaxy_ng/app/dynaconf_hooks.py index 8c999972a4..1341736120 100755 --- a/galaxy_ng/app/dynaconf_hooks.py +++ b/galaxy_ng/app/dynaconf_hooks.py @@ -64,12 +64,11 @@ def configure_dab_resource_registry(settings: Dynaconf) -> Dict[str, Any]: data = {} if flags["dab_resource_registry"]: - data["INSTALLED_APPS"] = ['ansible_base.resource_registry', 'dynaconf_merge'] data["ANSIBLE_BASE_RESOURCE_CONFIG_MODULE"] = "galaxy_ng.app.api.resource_api" # this always needs social_django installed ... if "social_django" not in settings.INSTALLED_APPS: - data["INSTALLED_APPS"].append("social_django") + data["INSTALLED_APPS"] = ["social_django"] return data diff --git a/galaxy_ng/app/settings.py b/galaxy_ng/app/settings.py index b700c41c3c..deda4d51d8 100644 --- a/galaxy_ng/app/settings.py +++ b/galaxy_ng/app/settings.py @@ -25,6 +25,7 @@ 'rest_framework.authtoken', 'crum', 'dynaconf_merge', + 'ansible_base.resource_registry', ]