Skip to content

testing: Make integration tests kinetic friendly#1441

Merged
blackboxsw merged 2 commits into
canonical:mainfrom
TheRealFalcon:kinetic-tests
May 10, 2022
Merged

testing: Make integration tests kinetic friendly#1441
blackboxsw merged 2 commits into
canonical:mainfrom
TheRealFalcon:kinetic-tests

Conversation

@TheRealFalcon
Copy link
Copy Markdown
Contributor

Proposed Commit Message

testing: Make integration tests kinetic friendly

"/etc/cloud/cloud.cfg.d/99-detect-lxd-first.cfg",
"datasource_list: [LXD, NoCloud]\n",
)
if ImageSpecification.from_os_image().release == "jammy":
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@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?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I had originally put this in here for two reasons:

  1. 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.py for each platform which don't modify default datasource_list config and manage to detect the right datasource).
  2. 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_LXD and dscheck_NoCloud functions 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.d in this test which is what feeds ds-id's read_datasource_list so we don't limit ds-identify behavior because > 1 elements are in datasource_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.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Ah, thanks. That makes sense. I can put it back.

Copy link
Copy Markdown
Collaborator

@blackboxsw blackboxsw left a comment

Choose a reason for hiding this comment

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

LGTM . Will land when CI passes.

@blackboxsw blackboxsw merged commit 948a9e2 into canonical:main May 10, 2022
@TheRealFalcon TheRealFalcon deleted the kinetic-tests branch March 21, 2025 18:48
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