From d0acb1c53f177ae859a469a868fcc5e840eff8e8 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Thu, 20 Apr 2023 13:19:00 -0400 Subject: [PATCH] Delete cp of local_settings.py file in test running, because path no longer exists (#13894) * Change reference to moved local_settings.py file * Do not appy local_settings to test runner --- .../ansible/roles/sources/templates/local_settings.py.j2 | 3 +-- tools/docker-compose/start_tests.sh | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/docker-compose/ansible/roles/sources/templates/local_settings.py.j2 b/tools/docker-compose/ansible/roles/sources/templates/local_settings.py.j2 index 0b4ffd0160..43be7b33d8 100644 --- a/tools/docker-compose/ansible/roles/sources/templates/local_settings.py.j2 +++ b/tools/docker-compose/ansible/roles/sources/templates/local_settings.py.j2 @@ -1,8 +1,7 @@ # Copyright (c) 2015 Ansible, Inc. (formerly AnsibleWorks, Inc.) # All Rights Reserved. -# Local Django settings for AWX project. Rename to "local_settings.py" and -# edit as needed for your development environment. +# Local Django settings for AWX project. # All variables defined in awx/settings/development.py will already be loaded # into the global namespace before this file is loaded, to allow for reading diff --git a/tools/docker-compose/start_tests.sh b/tools/docker-compose/start_tests.sh index 2e80679cb2..67f2e644a6 100755 --- a/tools/docker-compose/start_tests.sh +++ b/tools/docker-compose/start_tests.sh @@ -5,8 +5,6 @@ cd /awx_devel make clean make awx-link -cp tools/docker-compose/ansible/roles/sources/files/local_settings.py awx/settings/local_settings.py - if [[ ! $@ ]]; then make test else