Amogan/daq release issue568 - #347
Open
andrewmogan wants to merge 9 commits into
Open
Conversation
…rintout for all or local repos to hopefully be a little cleaner.
…nto amogan/daq_release_issue568
…b.com/DUNE-DAQ/daqsystemtest into amogan/daq_release_issue568
andrewmogan
marked this pull request as ready for review
September 4, 2026 15:21
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.
Description
This PR addresses daq-release #568. Our nightly integration test workflows categorize our integration tests into "core" and "extended" tests. Core tests are a selection of
daqsystemtesttests and thelistrev_testfromlistrev. Extended tests are all non-core tests. This distinction doesn't exist indbt-build --integtest, and getting the right tests to run is currently done in a somewhat hacky way.To make it easier to select integration tests for an arbitrary release, this PR adds functionality to
dunedaq_integtest_bundle.shto define "suites" of tests, allowing it to effectively replacedbt-build --integtest. Test suites can be defined in a text file indaqsystemtest/scripts/test_suites/. Each line in this file should be formatted as<repo_name>:<test_name>; seecore.txtfor an example. Assuming a corresponding suite file exists, you run this asdunedaq_integtest_bundle.sh -s <my_suite> [etc.]. As of now, the only valid suite is "core," where "extended" is a special case treated as the inverse of "core." But this functionality allows for defining any arbitrary set of tests as a named suite, which some developers may find useful. Even if no suites are ever added, this gives us a single source of truth for our list of core tests.In order for this to be used as part of our nightly core integration test workflow, I also added a
--junit-xmloption which appends--junit-xml <repo_name>_<test_name>_results.xmltoPYTEST_COMMANDif supplied. Our nightly core integration test workflow uses these junit XML files to build the integration test page on the CI dashboard.Incidentally, this fixes an issue where some
daqsystemtesttests that were not defined as core tests weren't running as part of any nightly integration test workflow.I've provided usage examples below. Note that passing
-k,-x,-r, or-Rin combination with-scauses the script to emit a warning, but does not stop the tests from running. This is because a) the additional arguments don't always behave as one might intuitively expect, and b) these arguments defeat the purpose of defining test suites in the first place. This could arguably be an error instead of a warning, but I've kept it as a warning for now.dunedaq_integtest_bundle.sh -s core dunedaq_integtest_bundle.sh -s extended --junit-xml dunedaq_integtest_bundle.sh -s core --junit-xml --pytest-options "--dunerc-option log-level debug"Type of change
Testing checklist
In progress. I've noticed that not all the correct tests are listed in some corner cases, hence the draft status.
dunedaq_integtest_bundle.sh)Further checks