-
Notifications
You must be signed in to change notification settings - Fork 319
[IntegTest][Release-3.14] Fix test_dcv in ADC regions by ensuring known_hosts path exists to avoid cat command failure #7085
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.
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,9 @@ | |
| import logging | ||
| import os as operating_system | ||
| import re | ||
| import stat | ||
| import subprocess | ||
| from pathlib import Path | ||
|
|
||
| import pytest | ||
| import requests | ||
|
|
@@ -157,23 +159,37 @@ def _check_error_cases(remote_command_executor, dcv_authenticator_port): | |
| ) | ||
|
|
||
|
|
||
| def _test_show_url(cluster, region, dcv_port, access_from, use_login_node=False): | ||
| def _test_show_url(cluster, region, dcv_port, access_from, use_login_node=False): # noqa: C901 | ||
| """Test dcv-connect with --show-url.""" | ||
| env = operating_system.environ.copy() | ||
| env["AWS_DEFAULT_REGION"] = region | ||
|
|
||
| node_ip = cluster.get_login_node_public_ip() if use_login_node else cluster.head_node_ip | ||
|
|
||
| # add ssh key to jenkins user known hosts file to avoid ssh keychecking prompt | ||
| # Ensure known_hosts path exists to avoid `cat` command returning non-zero exit when testing in ADC region. | ||
| host_keys_file = operating_system.path.expanduser("~/.ssh/known_hosts") | ||
| logging.info(f"Add ip address {node_ip} to known hosts file {host_keys_file}") | ||
| host_keys_path = Path(host_keys_file) | ||
| try: | ||
| host_keys_path.parent.mkdir(parents=True, exist_ok=True) | ||
| if not host_keys_path.exists(): | ||
| host_keys_path.touch() | ||
| host_keys_path.chmod(stat.S_IRUSR | stat.S_IWUSR) # 0600 | ||
| except Exception as e: | ||
| logging.warning(f"Failed to prepare known_hosts file {host_keys_file}: {e}") | ||
|
|
||
| result = subprocess.check_output("cat {0}".format(host_keys_file), shell=True) | ||
| logging.info(f"Original content of known hosts file {host_keys_file}: {result}") | ||
| try: | ||
| before_content = subprocess.check_output(f"cat {host_keys_file}", shell=True) | ||
| except subprocess.CalledProcessError: | ||
| before_content = b"" | ||
| logging.info(f"Original content of known hosts file {host_keys_file}: {before_content}") | ||
|
|
||
| add_keys_to_known_hosts(node_ip, host_keys_file) | ||
| result = subprocess.check_output("cat {0}".format(host_keys_file), shell=True) | ||
| logging.info(f"New content of known hosts file {host_keys_file}: {result}") | ||
|
|
||
| try: | ||
|
||
| after_content = subprocess.check_output(f"cat {host_keys_file}", shell=True) | ||
| except subprocess.CalledProcessError: | ||
| after_content = b"" | ||
| logging.info(f"New content of known hosts file {host_keys_file}: {after_content}") | ||
|
|
||
| dcv_connect_args = ["pcluster", "dcv-connect", "--cluster-name", cluster.name, "--show-url"] | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are we removing this comment. It seems we are still adding the ssh key to the known hosts file. So I think it is important to keep this information.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Delete it by mistake, I have added it back.