Check resolv.conf file for updated --dns-server instead of guestinfo. #7824
Conversation
isos/base/utils.sh
Outdated
| @@ -179,6 +179,10 @@ END { | |||
| ensure_apt_packages() { | |||
| local install | |||
|
|
|||
| if [ -x /usr/local/bin/xorriso -a -x /usr/bin/cpio ]; then | |||
There was a problem hiding this comment.
Why? We're passing in the package names we depend on to confirm and instead you've hardcoded a check for specific binaries.
I also see absolutely no correlation between this change and #7775
There was a problem hiding this comment.
this is just to trigger CI, nothing else.
Codecov Report
@@ Coverage Diff @@
## master #7824 +/- ##
==========================================
- Coverage 26.58% 25.69% -0.89%
==========================================
Files 36 35 -1
Lines 5183 5125 -58
==========================================
- Hits 1378 1317 -61
- Misses 3699 3701 +2
- Partials 106 107 +1
Continue to review full report at Codecov.
|
vburenin
changed the title
| ${rc} ${output}= Run And Return Rc and Output sshpass -p %{TEST_PASSWORD} ssh -o StrictHostKeyChecking=no root@%{VCH-IP} cat /etc/resolv.conf | ||
| Should Be Equal As Integers ${rc} 0 | ||
| Should Not Contain ${output} nameserver 10.118.81.1 | ||
| Should Not Contain ${output} nameserver 10.118.81.2 |
There was a problem hiding this comment.
This too?
- ${rc} ${output}= Run And Return Rc and Output sshpass -p %{TEST_PASSWORD} ssh -o StrictHostKeyChecking=no root@%{VCH-IP} cat /etc/resolv.conf | grep nameserver | wc -l
- Should Be Equal As Integers ${rc} 0
- Should Contain ${output} 2
There was a problem hiding this comment.
I thought about it, but since it is dependent on DHCP configuration the number of DNS servers may vary, so can't really use it here.
… file for updated --dns-server instead of guestinfo. (#7824) * Enable SSH and check /etc/resolv.conf directly for the appropriate config changes. * DNS vic-machine test has been updated to look for the real data. * Removed guest info check. * Improved behavior with DHCP DNS server assignment. Ignore DHCP settings if DNS servers are set manually via --dns-server option. * Added more logs to track which DHCP options are set.
Ready for review.
Fixes #7775
[specific ci=6-16-Config]