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

Merge EGG.DATA and EGG_FLOW.DATA #9601

Merged
merged 1 commit into from
Dec 20, 2024

Conversation

berland
Copy link
Contributor

@berland berland commented Dec 20, 2024

Removing QUIESC from EGG.DATA makes it possible to merge these two decks into one, and fixes an otherwise non-functional EGG_FLOW setup. This allows future CI tests on Everest with flow.

Issue
Resolves non-functional config_flow.yml for Everest.

Approach

  • PR title captures the intent of the changes, and is fitting for release notes.
  • Added appropriate release note label
  • Commit history is consistent and clean, in line with the contribution guidelines.
  • Make sure unit tests pass locally after every commit (git rebase -i main --exec 'pytest tests/ert/unit_tests -n logical -m "not integration_test"')

When applicable

  • When there are user facing changes: Updated documentation
  • New behavior or changes to existing untested code: Ensured that unit tests are added (See Ground Rules).
  • Large PR: Prepare changes in small commits for more convenient review
  • Bug fix: Add regression test for the bug
  • Bug fix: Create Backport PR to latest release

Removing QUIESC from EGG.DATA makes it possible to merge these two decks into one,
and fixes an otherwise non-functional EGG_FLOW setup. This allows future CI tests on
Everest with flow.
@berland berland added the release-notes:maintenance Automatically categorise as maintenance change in release notes label Dec 20, 2024
@berland berland requested a review from oyvindeide December 20, 2024 10:49
@berland berland self-assigned this Dec 20, 2024
Copy link
Collaborator

@oyvindeide oyvindeide left a comment

Choose a reason for hiding this comment

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

Nice job cleaning! 🧹

@berland berland enabled auto-merge (rebase) December 20, 2024 10:51
@berland berland merged commit 1889e2a into equinor:main Dec 20, 2024
40 checks passed
@codecov-commenter
Copy link

codecov-commenter commented Dec 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.86%. Comparing base (2e9c71a) to head (d3b43a6).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9601      +/-   ##
==========================================
- Coverage   91.89%   91.86%   -0.03%     
==========================================
  Files         433      433              
  Lines       26813    26813              
==========================================
- Hits        24639    24632       -7     
- Misses       2174     2181       +7     
Flag Coverage Δ
cli-tests 39.74% <ø> (ø)
everest-models-test 34.59% <ø> (ø)
gui-tests 72.10% <ø> (-0.06%) ⬇️
integration-test 38.72% <ø> (-0.02%) ⬇️
performance-tests 51.94% <ø> (ø)
test 40.08% <ø> (+0.02%) ⬆️
unit-tests 74.14% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

codspeed-hq bot commented Dec 20, 2024

CodSpeed Performance Report

Merging #9601 will not alter performance

Comparing berland:merge_everest_config_flow (d3b43a6) with main (2e9c71a)

Summary

✅ 24 untouched benchmarks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-notes:maintenance Automatically categorise as maintenance change in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants