Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.13.z] Force keyscan to use ipv4 #14178

Merged
merged 1 commit into from
Feb 26, 2024
Merged

[6.13.z] Force keyscan to use ipv4 #14178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pytest_fixtures/component/templatesync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion tests/foreman/cli/test_templatesync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,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')
Expand Down
Loading