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

[uss_qualifier] Clean up dev configurations #267

Merged
merged 8 commits into from
Oct 20, 2023

Conversation

BenjaminPelletier
Copy link
Member

After having some problems tracking test resource usage, I found that we really need to clean up resource organization in our dev configurations. This PR does that. library/resources.yaml is changed to be a flat list of resources which are then included one-by-one into configurations as needed (no groups of requirements any more -- that was hard to trace what was actually ending up in use). library/environment.yaml is changed to be just a pointer to the containers-based environment file, and environment_containers.yaml is changed to also be a flat list of resources. Each dev configuration includes each resource used individually so there is only one hop between configuration definition and resource definition (assuming the environment -> environment_containers is ignored).

The f3548 configuration is removed as duplicative of f3548_self_contained and uspace.

faa.uft.local_message_signing is promoted to just message_signing and added to the CI.

A bug in the f3548 suite is fixed so that the separate flight intents are used for the separate scenarios (equal priority and higher priority), and this revealed that conflicting_flights.json was actually not being used at all (only priority_preemption.json), so conflicting_flights.json's content is replaced with priority_preemption.json's content and priority_preemption.json is removed.

All remaining dev configurations are verified to work, including the ones in the f3548 subfolder (though I intend to replace these with a selective execution feature in the near future).

A warning message is added when test suite actions are skipped.

@BenjaminPelletier BenjaminPelletier marked this pull request as ready for review October 19, 2023 02:57
@@ -273,17 +265,49 @@
"cellular"
],
"endurance_minutes": 30,
"emergency_procedure_url": "https://example.uav.com/emergency",
"emergency_procedure_url": "https://uav.com/emergency",
Copy link
Contributor

Choose a reason for hiding this comment

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

To prevent to send by mistake request to undesired domain, may I suggest we use example.interuss.org as dummy domain ? To be discussed and addressed in another PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

That seems like a good idea and doesn't affect the substance of this PR so easy to drop it into this PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

Actually, systematically resolving this would be beyond the scope of this PR; added #275 instead

configurations.dev.geoawareness_cis,\
configurations.dev.generate_rid_test_data,\
configurations.dev.geospatial_comprehension,\
configurations.dev.general_flight_auth,\
configurations.dev.f3548,\
configurations.dev.message_signing,\
configurations.dev.dss_probing,\
configurations.dev.f3548_self_contained,\
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we exercice all configurations.dev.f3548.* as well?

Copy link
Member Author

Choose a reason for hiding this comment

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

I intend to make those configurations obsolete in the near future by enabling users to selectively run parts of a larger configuration. My thought is that since they're not already part of the CI, not adding them isn't a regression (and we don't have to worry about maintaining them or enduring the CI runtime addition in between now and selective execution).

@barroco
Copy link
Contributor

barroco commented Oct 20, 2023

Thank you for taking care of it. It really improves readability.

@BenjaminPelletier BenjaminPelletier merged commit bb7a2c7 into interuss:main Oct 20, 2023
9 checks passed
@BenjaminPelletier BenjaminPelletier deleted the clean-up-resources branch October 20, 2023 19:01
github-actions bot added a commit that referenced this pull request Oct 20, 2023
* Clean up dev configurations

* Fix link

* Update link

* Fix intent link

* Fix example domains per comment

* Update hash bb7a2c7
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