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

FARM Submodule update #1846

Merged
merged 341 commits into from
Jun 8, 2022
Merged

FARM Submodule update #1846

merged 341 commits into from
Jun 8, 2022

Conversation

wanghy-anl
Copy link
Contributor

@wanghy-anl wanghy-anl commented Jun 7, 2022


Pull Request Description

What issue does this change request address? (Use "#" before the issue to link it, i.e., #42.)

This PR is together with HERON PR #175, separation of FARM-based validators from HERON
see #1114

What are the significant changes in functionality due to this change request?

FARM-based HERON validators are now in FARM repository.
Tests files were added for FARM-None, FARM-Alpha, FARM-Beta, FARM-Gamma-LTI and FARM-Gamma-FMU validators.


For Change Control Board: Change Request Review

The following review must be completed by an authorized member of the Change Control Board.

  • 1. Review all computer code.
  • 2. If any changes occur to the input syntax, there must be an accompanying change to the user manual and xsd schema. If the input syntax change deprecates existing input files, a conversion script needs to be added (see Conversion Scripts).
  • 3. Make sure the Python code and commenting standards are respected (camelBack, etc.) - See on the wiki for details.
  • 4. Automated Tests should pass, including run_tests, pylint, manual building and xsd tests. If there are changes to Simulation.py or JobHandler.py the qsub tests must pass.
  • 5. If significant functionality is added, there must be tests added to check this. Tests should cover all possible options. Multiple short tests are preferred over one large test. If new development on the internal JobHandler parallel system is performed, a cluster test must be added setting, in XML block, the node <internalParallel> to True.
  • 6. If the change modifies or adds a requirement or a requirement based test case, the Change Control Board's Chair or designee also needs to approve the change. The requirements and the requirements test shall be in sync.
  • 7. The merge request must reference an issue. If the issue is closed, the issue close checklist shall be done.
  • 8. If an analytic test is changed/added is the the analytic documentation updated/added?
  • 9. If any test used as a basis for documentation examples (currently found in raven/tests/framework/user_guide and raven/docs/workshop) have been changed, the associated documentation must be reviewed and assured the text matches the example.

moosebuild added 30 commits August 25, 2017 11:41
@wangcj05
Copy link
Collaborator

wangcj05 commented Jun 7, 2022

@wanghy-anl FYI, there are four tests failed:
image

@wanghy-anl
Copy link
Contributor Author

wanghy-anl commented Jun 7, 2022

@wanghy-anl FYI, there are four tests failed: image

Congjian, Thanks for letting me know. I realized that these four failed tests requires the merging of an HERON PR #175. However, HERON PR #175 needs this raven PR #1846 to be merged first.

@PaulTalbot-INL @wangcj05 How could we solve this deadlock issue? I can run the tests on both Windows and Mac machine with the related files changed (mimicking that both PRs are merged) and show you the log as a proof.

Let me know how to proceed.
Thanks,
Haoyu

@wanghy-anl
Copy link
Contributor Author

I think there is a way out with 3 steps:

  1. I can temporarily remove these 4 failed and 1 skipped tests (these 5 tests are for using FARM-based validator in HERON) while keeping all the other codes unchanged, then the remaining tests can pass. @wangcj05 can merge the PR to update the FARM submodule version if he sees no problem in the code;
  2. Then @PaulTalbot-INL can re-run the tests on raven-centos-8 server for HERON PR Wanghy/farm gamma validators HERON#175, and merge the PR to HERON as he sees fit;
  3. I can enable the 5 tests on raven again and submit a new submodule update PR.

How do you think about this plan?
Thanks,
Haoyu

@wangcj05
Copy link
Collaborator

wangcj05 commented Jun 7, 2022

I think there is a way out with 3 steps:

  1. I can temporarily remove these 4 failed and 1 skipped tests (these 5 tests are for using FARM-based validator in HERON) while keeping all the other codes unchanged, then the remaining tests can pass. @wangcj05 can merge the PR to update the FARM submodule version if he sees no problem in the code;
  2. Then @PaulTalbot-INL can re-run the tests on raven-centos-8 server for HERON PR Wanghy/farm gamma validators HERON#175, and merge the PR to HERON as he sees fit;
  3. I can enable the 5 tests on raven again and submit a new submodule update PR.

How do you think about this plan? Thanks, Haoyu

Hi @wanghy-anl: I can merge this PR (Plugin is allowed to fail in RAVEN) if both you and Paul @PaulTalbot-INL are good with this update. I think there is no need to disable the test and enable them later.

@wanghy-anl
Copy link
Contributor Author

Thanks Congjian. I am good with this update. How do you think Paul? @PaulTalbot-INL

@PaulTalbot-INL
Copy link
Collaborator

Congjian's suggestion is how we often handle this for TEAL and HERON, and is fine with me.

@wangcj05
Copy link
Collaborator

wangcj05 commented Jun 8, 2022

This PR only updates submodule ID, and there is not actually code updates. Regression tests are good except sawtooth test which is under maintenance right now. As CCB, I will approve this PR.

@wangcj05 wangcj05 merged commit eda43b8 into idaholab:devel Jun 8, 2022
@wangcj05
Copy link
Collaborator

wangcj05 commented Jun 8, 2022

@wanghy-anl I have merged your PR, thanks for your contribution. By the way, please work on the HERON PR, one it is merged, please ask HERON developers to create a PR to update HERON submodule ID.

@wanghy-anl
Copy link
Contributor Author

Thank you Congjian, I will talk to Paul to update the HERON submodule ID.

@wanghy-anl wanghy-anl deleted the SubmoduleUpdate branch June 8, 2022 14:52
@moosebuild
Copy link

Job Test qsubs sawtooth on 11fd3d9 : invalidated by @joshua-cogliati-inl

restarted civet

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.

5 participants