Skip to content

Minor changes to dfmodules integtests#484

Merged
bieryAtFnal merged 5 commits intodevelopfrom
kbiery/minor_integtest_changes_March2026
Mar 26, 2026
Merged

Minor changes to dfmodules integtests#484
bieryAtFnal merged 5 commits intodevelopfrom
kbiery/minor_integtest_changes_March2026

Conversation

@bieryAtFnal
Copy link
Copy Markdown
Collaborator

@bieryAtFnal bieryAtFnal commented Mar 26, 2026

Description

The changes in this PR are for fddaq-v5.7.0.

There are several small changes in this PR:

  • the first one is to prevent an occasional regression test failure in which the max_file_size_test produces a TPStream data file in which the last TimeSlice does not have the full number of expected fragments. This is not a big deal, so the test conditions were modified to allow the last TimeSlice to have slightly fewer fragments.
  • the resource validation in the max_file_size_test was updated to make use of the newest ResourceValidation utility in the integrationtest repo. This has several advantages, including centralized reporting of insufficient resources and support for recommended resources in addition to required resources.
  • the dfmodules_integtest_bundle.sh script was modified to call out to the global bundle script (dunedaq_integtest_bundle.sh in the daqsystemtest repo). This is part of moving away from repo-specific bundle scripts.
  • references to the obsolete data_rate_slowdown_factor parameter were removed.

Here are sample instructions for validating several of these changes:

DATE_PREFIX=`date '+%d%b'`
TIME_SUFFIX=`date '+%H%M'`

source /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh
setup_dbt latest
dbt-create -n NFD_DEV_260325_A9 ${DATE_PREFIX}FDDevTest_${TIME_SUFFIX}
cd ${DATE_PREFIX}FDDevTest_${TIME_SUFFIX}/sourcecode

git clone https://github.com/DUNE-DAQ/daqsystemtest.git -b develop
git clone https://github.com/DUNE-DAQ/dfmodules.git -b develop
cd ..

dbt-workarea-env
dbt-build -j 12
dbt-workarea-env

dunedaq_integtest_bundle.sh -r dfmodules -k max -N 3 --stop

echo ""
echo -e "\U1F535 \U2705 Note that the max_file_size_test may have failed. \U2705 \U1F535"
echo ""
echo ""
sleep 3

cd sourcecode/dfmodules
git checkout kbiery/minor_integtest_changes_March2026
cd ../../

dbt-build -j 12
dbt-workarea-env

dunedaq_integtest_bundle.sh -r dfmodules -k max -N 3 --concise --stop

echo ""
echo -e "\U1F535 \U2705 Note that the max_file_size_test did not report any errors. \U2705 \U1F535"
echo ""
echo ""
sleep 3

dfmodules_integtest_bundle.sh --help

echo ""
echo -e "\U1F535 \U2705 Note that the dfmodules_integtest_bundle.sh script redirects to the dunedaq_integtest_bundle.sh script. \U2705 \U1F535"
echo ""
echo ""
sleep 3

dfmodules_integtest_bundle.sh -k offline --stop

echo ""
echo -e "\U1F535 \U2705 Note that we can still use the dfmodules_integtest_bundle.sh script to run dfmodules integtests. \U2705 \U1F535"
echo ""
echo ""

Type of change

  • Optimization (non-breaking change that improves code/performance)

Testing checklist

  • Full set of integration tests pass (dunedaq_integtest_bundle.sh)

Kurt Biery added 5 commits March 25, 2026 10:05
…meSlice in the generated TPStream files in the max_file_size_test.py integtest.
…edirects to the global bundle script (dunedaq_integtest_bundle.sh) [but still focusses on the dfmodules tests].
@bieryAtFnal bieryAtFnal requested a review from andrewmogan March 26, 2026 12:12
Copy link
Copy Markdown
Contributor

@andrewmogan andrewmogan left a comment

Choose a reason for hiding this comment

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

The changes all make sense and the tests work as stated. Approved.

@bieryAtFnal bieryAtFnal merged commit 251c963 into develop Mar 26, 2026
4 checks passed
@bieryAtFnal bieryAtFnal deleted the kbiery/minor_integtest_changes_March2026 branch March 26, 2026 16:10
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.

3 participants