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.

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

Fixing Test related to SRL 23.10 #1709

Merged
merged 4 commits into from
Nov 12, 2023
Merged

Conversation

steiler
Copy link
Collaborator

@steiler steiler commented Nov 10, 2023

fix tests

@steiler steiler marked this pull request as ready for review November 10, 2023 15:42
nodes/srl/srl.go Outdated
Comment on lines 603 to 610
if len(n.sshPubKeys) > 0 && (semver.Compare(n.swVersion.String(), "v23.10") >= 0 || n.swVersion.major == "0") {
tplData.SSHPubKeys = catenateKeys(n.sshPubKeys)
} else {
// prior to 23.10.1 only rsa keys are supported
// this function filters out non-rsa keys from the
// list of ssh public keys found on the system/agent
n.filterSSHPubKeys()
}
Copy link
Member

@hellt hellt Nov 10, 2023

Choose a reason for hiding this comment

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

@steiler I brought back the filtering function since it is required for SRL < 23.10.1

Copy link
Member

Choose a reason for hiding this comment

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

I am dumb. Filtering is not needed as now we support all types of keys in the config in 23.10, and older releases use mounted files, where, again, all keys can be put.

Copy link

codecov bot commented Nov 12, 2023

Codecov Report

Merging #1709 (fb861f2) into main (ed0ceb8) will increase coverage by 0.11%.
Report is 2 commits behind head on main.
The diff coverage is 100.00%.

❗ Current head fb861f2 differs from pull request most recent head 81b5e2b. Consider uploading reports for the commit 81b5e2b to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1709      +/-   ##
==========================================
+ Coverage   51.60%   51.72%   +0.11%     
==========================================
  Files         141      141              
  Lines       13759    13762       +3     
==========================================
+ Hits         7100     7118      +18     
+ Misses       5870     5858      -12     
+ Partials      789      786       -3     
Files Coverage Δ
nodes/srl/srl.go 58.02% <100.00%> (+0.82%) ⬆️

... and 5 files with indirect coverage changes

@hellt hellt merged commit 1784608 into srl-labs:main Nov 12, 2023
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants