Skip to content

Minor improvements to das-up-to-nevents.py#49045

Merged
cmsbuild merged 1 commit intocms-sw:masterfrom
kpedro88:dasNevents
Oct 8, 2025
Merged

Minor improvements to das-up-to-nevents.py#49045
cmsbuild merged 1 commit intocms-sw:masterfrom
kpedro88:dasNevents

Conversation

@kpedro88
Copy link
Copy Markdown
Contributor

@kpedro88 kpedro88 commented Oct 1, 2025

PR description:

  1. Use a simple regex to accept golden JSON files matching the desired pattern, rather than trying to reject files that don't match the pattern (which requires more maintenance).
  2. Add a more informative error message when the JSON list cannot be populated.

PR validation:

Tested succeeding and failing commands before and after this change and saw intended results.

If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for:

Not a backport, not intended to be backported unless requested.

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Oct 1, 2025

cms-bot internal usage

@kpedro88
Copy link
Copy Markdown
Contributor Author

kpedro88 commented Oct 1, 2025

@AdrianoDee please let me know if I missed anything here

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Oct 1, 2025

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-49045/46257

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Oct 1, 2025

A new Pull Request was created by @kpedro88 for master.

It involves the following packages:

  • Configuration/PyReleaseValidation (upgrade, pdmv)

@AdrianoDee, @DickyChant, @Moanwar, @antoniovagnerini, @cmsbuild, @miquork, @srimanob, @subirsarkar can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @fabiocos, @makortel, @slomeo this is something you requested to watch as well.
@ftenchini, @mandrenguyen, @sextonkennedy you are the release manager for this.

cms-bot commands are listed here

json_list = [c for c in json_list if "golden" in c.lower() and "era" not in c.lower() and "cert_c" in c.lower() and "ppref" not in c.lower()]
json_list = [[cc for cc in c.split(" ") if cc.lower().startswith("cert_c") and cc.endswith("json")][0] for c in json_list]
json_list_full = get_url_clean(cert_url).split("\n")
pattern = re.compile("(cert_collisions\d{4}_\d*_\d*_golden.json)$", re.IGNORECASE)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Maybe this regex could be directly cert_collisions\d{4}_\d{6}_\d{6}_golden.json ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I wasn't sure if we would still be in 6-digit run numbers by the end of the HL-LHC...

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Right!

@AdrianoDee
Copy link
Copy Markdown
Contributor

@AdrianoDee please let me know if I missed anything here

Thanks for making it cleaner

@AdrianoDee
Copy link
Copy Markdown
Contributor

please test
(to see also if we reproduce the failure)

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Oct 2, 2025

-1

Failed Tests: RelVals RelVals-INPUT
Size: This PR adds an extra 24KB to repository
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d5b71c/48414/summary.html
COMMIT: 7ae449e
CMSSW: CMSSW_16_0_X_2025-10-01-2300/el8_amd64_gcc13
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/49045/48414/install.sh to create a dev area with all the needed externals and cmssw changes.

  • DAS Queries: The DAS query tests failed, see the summary page for details.

RelVals

  • 2023.0020001DAS Error
  • 2025.0000001DAS Error
  • 2022.0030001DAS Error
Expand to see more relval errors ...
  • 2024.0030001
  • 2024.0010001
  • 2024.0070001
  • 2024.0050001
  • 2025.0010001
  • 2024.0020001
  • 2024.0000001
  • 2024.0060001
  • 2024.0040001

RelVals-INPUT

  • 2023.0000001DAS Error
  • 2023.0020001DAS Error
  • 2022.0010001DAS Error
Expand to see more relval errors ...
  • 2025.0000001
  • 2022.0030001
  • 2024.0030001
  • 2024.0010001
  • 2025.0010001
  • 2024.0070001
  • 2024.0050001
  • 2025.0020001
  • 2023.0010001
  • 2022.0000001
  • 2022.0020001
  • 2024.0020001
  • 2024.0000001
  • 2024.0060001
  • 2024.0040001

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Oct 2, 2025

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-49045/46269

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Oct 2, 2025

Pull request #49045 was updated. @AdrianoDee, @DickyChant, @Moanwar, @antoniovagnerini, @cmsbuild, @miquork, @srimanob, @subirsarkar can you please check and sign again.

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Oct 3, 2025

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Oct 3, 2025

Pull request #49045 was updated. @AdrianoDee, @DickyChant, @Moanwar, @antoniovagnerini, @cmsbuild, @miquork, @srimanob, @subirsarkar can you please check and sign again.

@kpedro88
Copy link
Copy Markdown
Contributor Author

kpedro88 commented Oct 3, 2025

rebased and squashed

@kpedro88
Copy link
Copy Markdown
Contributor Author

kpedro88 commented Oct 3, 2025

please test

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Oct 3, 2025

+1

Size: This PR adds an extra 20KB to repository
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d5b71c/48451/summary.html
COMMIT: 8ff0b09
CMSSW: CMSSW_16_0_X_2025-10-03-1100/el8_amd64_gcc13
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/49045/48451/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • You potentially added 1 lines to the logs
  • Reco comparison results: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 51
  • DQMHistoTests: Total histograms compared: 3924791
  • DQMHistoTests: Total failures: 60
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3924711
  • DQMHistoTests: Total skipped: 20
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 50 files compared)
  • Checked 218 log files, 188 edm output root files, 51 DQM output files
  • TriggerResults: no differences found

@AdrianoDee
Copy link
Copy Markdown
Contributor

+pdmv

@kpedro88
Copy link
Copy Markdown
Contributor Author

kpedro88 commented Oct 7, 2025

@cms-sw/upgrade-l2 please sign

@Moanwar
Copy link
Copy Markdown
Contributor

Moanwar commented Oct 7, 2025

+Upgrade

@cmsbuild
Copy link
Copy Markdown
Contributor

cmsbuild commented Oct 7, 2025

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @sextonkennedy, @ftenchini, @mandrenguyen (and backports should be raised in the release meeting by the corresponding L2)

@ftenchini
Copy link
Copy Markdown

+1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants