Wait for sudo before ansible

Author: BillAnastasiadis

scripts/qesap/lib/cmds.py

@@ -372,6 +372,14 @@ def ansible_command_sequence(
     ssh_share += ' --ssh-extra-args="-l cloudadmin -o UpdateHostKeys=yes -o StrictHostKeyChecking=accept-new"'
     ansible_cmd_seq.append({"cmd": ssh_share})
 
+    sudo_wait = (
+        f'{ansible_bin_paths["ansible"]} {ansible_common} all '
+        '-m shell '
+        "-a 'i=0; while [ $i -lt 35 ]; do sudo -n true && exit 0; sleep 5; i=$((i+1)); done; exit 1' "
+        '--ssh-extra-args="-l cloudadmin -o UpdateHostKeys=yes -o StrictHostKeyChecking=accept-new"'
+    )
+    ansible_cmd_seq.append({"cmd": sudo_wait})
+
     selected_list_of_playbooks = []
     if apiver < 4:
         selected_list_of_playbooks = configure_data_ansible[sequence]

scripts/qesap/test/conftest.py

@@ -215,6 +215,18 @@ def _callback(inventory):
     return _callback
 
 
+@pytest.fixture()
+def ansible_sudo_wait_call():
+    def _callback(inventory):
+        return (
+            f"{ANSIBLE_EXE} -vv -i {inventory} all "
+            "-m shell "
+            "-a 'i=0; while [ $i -lt 35 ]; do sudo -n true && exit 0; sleep 5; i=$((i+1)); done; exit 1' "
+            '--ssh-extra-args="-l cloudadmin -o UpdateHostKeys=yes -o StrictHostKeyChecking=accept-new"'
+        )
+    return _callback
+
+
 @pytest.fixture
 def mock_call_ansibleplaybook():
     """

scripts/qesap/test/unit/test_qesap_ansible.py

@@ -281,7 +281,7 @@ def test_ansible_no_bin(
 
 
 @mock.patch("shutil.which", side_effect=lambda x: fake_ansible_path(x))
-@mock.patch("lib.process_manager.subprocess_run", side_effect=[(0, []), (1, [])])
+@mock.patch("lib.process_manager.subprocess_run", side_effect=[(0, []), (0, []), (1, [])])
 def test_ansible_stop(
     run,
     _,
@@ -538,6 +538,7 @@ def test_ansible_ssh(
     ansible_config,
     mock_call_ansibleplaybook,
     ansible_exe_call,
+    ansible_sudo_wait_call,
 ):
     """
     This first Ansible command has to be called before all the others
@@ -578,6 +579,7 @@ def test_ansible_ssh(
     calls = []
 
     calls.append(mock.call(cmd=ansible_exe_call(inventory)))
+    calls.append(mock.call(cmd=ansible_sudo_wait_call(inventory)))
     for playbook in playbook_list:
         calls.append(mock_call_ansibleplaybook(inventory, playbook))
 

scripts/qesap/test/unit/test_qesap_lib_cmd_ansible.py

@@ -45,6 +45,7 @@ def test_cmd_ansible(
     create_playbooks,
     create_inventory,
     ansible_exe_call,
+    ansible_sudo_wait_call,
     mock_call_ansibleplaybook,
 ):
     """
@@ -82,6 +83,7 @@ def test_cmd_ansible(
     )
 
     calls = [mock.call(cmd=ansible_exe_call(inventory))]
+    calls.append(mock.call(cmd=ansible_sudo_wait_call(inventory)))
     calls.append(mock_call_ansibleplaybook(inventory, playbook[0]))
 
     ret = cmd_ansible(data, tmpdir, False, False)