testing: Make integration tests kinetic friendly#1441
Merged
Conversation
TheRealFalcon
commented
May 10, 2022
| "/etc/cloud/cloud.cfg.d/99-detect-lxd-first.cfg", | ||
| "datasource_list: [LXD, NoCloud]\n", | ||
| ) | ||
| if ImageSpecification.from_os_image().release == "jammy": |
Contributor
Author
There was a problem hiding this comment.
@blackboxsw , this wasn't specifically related, but I don't see why this section would be needed/wanted in tests testing the LXD datasource. Is it ok to remove this or is there something I'm missing?
Collaborator
There was a problem hiding this comment.
I had originally put this in here for two reasons:
- allow ds-identify to detect two vaible datasources and ensure a tracer through the system was available to ensure a tracer through the system the even when multiple datasources are detected, priority order is honored when we get to python datasource get_data discovery. But, that is test case is handled anyway though by integration tests
test_combined.pyfor each platform which don't modify default datasource_list config and manage to detect the right datasource). - I also had the thought I wanted to be sure that we configure more than 1 datasource so ds-identify actually does run the
dscheck_LXDanddscheck_NoCloudfunctions instead of skipping those discovery functions. But, I bet we can drop the seed file creation for two reasons:- we are configuring
datasouce_list: [LXD, NoCloud]in/etc/cloud/cloud.cfg.din this test which is what feeds ds-id'sread_datasource_listso we don't limit ds-identify behavior because > 1 elements are indatasource_list - Any Bionic, Focal and Impish test is going to detect both NoCloud (from seed files) and LXD (from socket presence) so we have the inverse ordering test where 2 viable datasources are detected, but default priority order is honored by selecting NoCloud over LXD.
- we are configuring
Contributor
Author
There was a problem hiding this comment.
Ah, thanks. That makes sense. I can put it back.
blackboxsw
approved these changes
May 10, 2022
Collaborator
blackboxsw
left a comment
There was a problem hiding this comment.
LGTM . Will land when CI passes.
This was referenced May 12, 2023
Closed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Proposed Commit Message