diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 7945b8e275..b5cb7ec1e8 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -2106,7 +2106,7 @@ class RunProjectUpdate(BaseTask): d = super(RunProjectUpdate, self).get_password_prompts(passwords) d[r'Username for.*:\s*?$'] = 'scm_username' d[r'Password for.*:\s*?$'] = 'scm_password' - d['Password:\s*?$'] = 'scm_password' # noqa + d[r'Password:\s*?$'] = 'scm_password' d[r'\S+?@\S+?\'s\s+?password:\s*?$'] = 'scm_password' d[r'Enter passphrase for .*:\s*?$'] = 'scm_key_unlock' d[r'Bad passphrase, try again for .*:\s*?$'] = '' diff --git a/awx_collection/tests/integration/targets/tower_project_manual/tasks/create_project_dir.yml b/awx_collection/tests/integration/targets/tower_project_manual/tasks/create_project_dir.yml index 5388a6d3fd..d92dee8221 100644 --- a/awx_collection/tests/integration/targets/tower_project_manual/tasks/create_project_dir.yml +++ b/awx_collection/tests/integration/targets/tower_project_manual/tasks/create_project_dir.yml @@ -1,16 +1,4 @@ --- -- name: get tower host variable - shell: tower-cli config host | cut -d ' ' -f2 - register: host - -- name: get tower username variable - shell: tower-cli config username | cut -d ' ' -f2 - register: username - -- name: get tower password variable - shell: tower-cli config password | cut -d ' ' -f2 - register: password - - name: Fetch project_base_dir uri: url: "{{ host.stdout }}/api/v2/config/" @@ -44,15 +32,15 @@ organization: Default - name: Disable process isolation - command: tower-cli setting modify AWX_PROOT_ENABLED false + command: awx-cli setting modify AWX_PROOT_ENABLED false - block: - name: Create a directory for manual project vars: project_base_dir: "{{ awx_config.json.project_base_dir }}" - command: tower-cli ad_hoc launch --wait --inventory localhost + command: awx-cli ad_hoc launch --wait --inventory localhost --credential dummy --module-name command --module-args "mkdir -p {{ project_base_dir }}/{{ project_dir_name }}" always: - name: enable process isolation - command: tower-cli setting modify AWX_PROOT_ENABLED true + command: awx-cli setting modify AWX_PROOT_ENABLED true