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

Jump to bottom

bunch of downburst fixes #1990

Merged
merged 3 commits into from
Aug 8, 2024
Merged

bunch of downburst fixes #1990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d42c541
provision/downburst: ignore "username@" prefix in hostname
Aug 2, 2024
e3a44bb
provision/downburst: add PATH to environment
Aug 1, 2024
837a0e1
misc: allow _ssh_keyscan return None again
Jul 31, 2024
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
3 changes: 2 additions & 1 deletion teuthology/misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,8 @@ def _ssh_keyscan(hostname):
for line in p.stdout:
host, key = line.strip().decode().split(' ', 1)
keys.append(key)
return sorted(keys)[0]
if len(keys) > 0:
return sorted(keys)[0]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zmc ;-)



def ssh_keyscan_wait(hostname):
Expand Down
3 changes: 2 additions & 1 deletion teuthology/provision/downburst.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ def downburst_executable():

def downburst_environment():
env = dict()
env['PATH'] = os.environ.get('PATH')
discover_url = os.environ.get('DOWNBURST_DISCOVER_URL')
if config.downburst and not discover_url:
if isinstance(config.downburst, dict):
Expand Down Expand Up @@ -215,7 +216,7 @@ def build_config(self):
'additional-disks-size': machine['volumes']['size'],
'arch': 'x86_64',
}
fqdn = self.name.split('@')[1]
fqdn = self.name.split('@')[-1]
file_out = {
'downburst': file_info,
'local-hostname': fqdn,
Expand Down