From ce4d3488347917b32ae0577072339c980539b858 Mon Sep 17 00:00:00 2001 From: Peter Ondrejka Date: Mon, 26 Feb 2024 09:13:54 +0100 Subject: [PATCH] Force keyscan to use ipv4 (#14017) Co-authored-by: yanpliu (cherry picked from commit 226a1f0a47b958753dd0f9f220ef3d28b1fbe1bb) --- pytest_fixtures/component/templatesync.py | 2 +- tests/foreman/cli/test_templatesync.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pytest_fixtures/component/templatesync.py b/pytest_fixtures/component/templatesync.py index 1e195ec838f..e6c93096a8b 100644 --- a/pytest_fixtures/component/templatesync.py +++ b/pytest_fixtures/component/templatesync.py @@ -66,7 +66,7 @@ def git_pub_key(session_target_sat, git_port): id = res.json()['id'] # add ssh key to known host session_target_sat.execute( - f'ssh-keyscan -t rsa -p {git.ssh_port} {git.hostname} > {key_path}/known_hosts' + f'ssh-keyscan -4 -t rsa -p {git.ssh_port} {git.hostname} > {key_path}/known_hosts' ) yield res = requests.delete( diff --git a/tests/foreman/cli/test_templatesync.py b/tests/foreman/cli/test_templatesync.py index 3f8472d829e..9959ae18459 100644 --- a/tests/foreman/cli/test_templatesync.py +++ b/tests/foreman/cli/test_templatesync.py @@ -161,7 +161,7 @@ def test_positive_update_templates_in_git( 'repo': url, 'branch': git_branch, 'organization-id': module_org.id, - 'filter': 'Atomic Kickstart default', + 'filter': 'User - Registered Users', 'dirname': dirname, } ).split('\n')