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

Moved the data_file_checks and dro_map_gen python files to the integrationtest repo... #43

Merged
merged 1 commit into from
Aug 21, 2023

Conversation

bieryAtFnal
Copy link
Contributor

…from the dfmodules repo.

We have been thinking about making this change for quite some time... Part of the motivation for doing it now is the concern that Eric raised in hsilibs PR 29. That PR deals with the change of repo for various integtests. The concern that Eric raised was the dependence of the new hsilibs integtest on the dfmodules package, which is not necessary otherwise.

There isn't anything really profound in this PR; it simply contains the move of two files from the dfmodules repo to the integrationtest repo.

This PR is correlated with PRs in dfmodules, daq-systemtest, and hsilibs. The PRs in those repos will be mentioned in a comment to this one soon, as will instructions for testing the changes in all four repos together.

@bieryAtFnal
Copy link
Contributor Author

bieryAtFnal commented Aug 3, 2023

Here are sample instructions for testing the changes in this repository along with the ones in daq-systemtest, dfmodules, and hsilibs:

# create the work area
source /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh
setup_dbt latest
dbt-create -c -n NFD23-08-20 20AugFDDevTest
cd 20AugFDDevTest
# clone the needed repositories
cd sourcecode
git clone https://github.com/DUNE-DAQ/daqconf.git -b develop
git clone https://github.com/DUNE-DAQ/daq-systemtest.git -b kbiery/move_integtest_funcs
git clone https://github.com/DUNE-DAQ/dfmodules.git -b kbiery/move_integtest_funcs
git clone https://github.com/DUNE-DAQ/hsilibs.git -b kbiery/move_integtest_funcs
cd ..
# clone and install the integrationtest repo
dbt-workarea-env
git clone https://github.com/DUNE-DAQ/integrationtest.git -b kbiery/move_dfmodules_funcs
cd integrationtest
pip install -U .
cd ..
# build the software
dbt-build -j 20
dbt-workarea-env
# bugger the python path so that dfmodules is not included from the base release
export PYTHONPATH=`echo $PYTHONPATH | sed 's,dfmodules-NB,trigger-NB,'`
# run a sample integtest
cd sourcecode/daq-systemtest/integtest
pytest -s minimal_system_quick_test.py --nanorc-option partition-number 2

Of course, a thorough validation of this PR would run through all of the integtests in daq-systemtest, dfmodules, and hsilibs. (Depending on which computer you use, you may see some tests get 'skipped' instead of run. That is fine. A failure to look up the needed import files will generate a more glaring error.)

Copy link
Member

@eflumerf eflumerf left a comment

Choose a reason for hiding this comment

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

LGTM. Ran integration tests without problems

@eflumerf eflumerf merged commit f3b82a3 into develop Aug 21, 2023
1 check passed
@eflumerf eflumerf deleted the kbiery/move_dfmodules_funcs branch August 21, 2023 16:13
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