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.

Sign up for GitHub

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

Jump to bottom

CMS: Particle Discovery Lab + NanoAOD trigger update #3680

Merged
merged 2 commits into from
Oct 10, 2024
Merged

CMS: Particle Discovery Lab + NanoAOD trigger update #3680

merged 2 commits into from
Oct 10, 2024

Conversation

jmhogan
Copy link
Contributor

@jmhogan jmhogan commented Sep 20, 2024

Two small long-hanging docs updates:

  1. Added an educational resource of mine. I chose record 49 since it's empty and adjacent to the group of educational records starting at 50, but could be changed.
  2. Updating the trigger system documentation to describe the NanoAOD branches.

If it's better to make these changes in the new structure, I have a branch based on master with these same updates.

@jmhogan jmhogan requested a review from katilp September 20, 2024 18:43
katilp
katilp requested changes Sep 22, 2024
View reviewed changes
Copy link
Member

@katilp katilp left a comment

Choose a reason for hiding this comment

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

Two minor things: A typo to fix, and is Dockerfile here on purpose.

Dockerfile Outdated Show resolved Hide resolved
cernopendata/modules/fixtures/data/docs/cms-guide-trigger-system/cms-guide-trigger-system.md Outdated Show resolved Hide resolved
@jmhogan
Copy link
Contributor Author

jmhogan commented Sep 23, 2024

ok @katilp got the fixes in and found the bad whitespace

@jmhogan jmhogan requested a review from katilp October 2, 2024 18:48
@jmhogan
Copy link
Contributor Author

jmhogan commented Oct 2, 2024

@katilp I guess github wants you to click some button....I can't find anything on my side that I can do to say "resolved"...

katilp
katilp approved these changes Oct 2, 2024
View reviewed changes
Copy link
Member

@katilp katilp left a comment

Choose a reason for hiding this comment

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

Thanks, looks good!

@jmhogan
Copy link
Contributor Author

jmhogan commented Oct 10, 2024

@tiborsimko I'm hoping this one is ready to go. Let me know if it would be better for me to close this PR and make the same changes against master or something that uses the new file structure.

jmhogan and others added 2 commits October 10, 2024 18:22
@jmhogan @tiborsimko
docs: CMS Particle Discovery Lab and NanoAOD trigger update
9ad5170 
Adds a record for the CMS Particle Discovery Lab educational resource.

Updates the CMS trigger system documentation to describe the NanoAOD
branches.
@tiborsimko
docker: pin cernopendata-portal image version
aca8f2b 
Pin the cernopendata-portal infrastructure container image version to
the stable release 0.1.11, fixing local deployment record loading
troubles.

Closes cernopendata/cernopendata-portal#64
@tiborsimko tiborsimko changed the base branch from qa to master October 10, 2024 16:26
@tiborsimko
Copy link
Member

tiborsimko commented Oct 10, 2024 •
edited
Loading

@tiborsimko I'm hoping this one is ready to go. Let me know if it would be better for me to close this PR and make the same changes against master or something that uses the new file structure.

Thanks, I have fixed some trailing dot in a link. It is not necessary for you to rebase against master, I have just made a push. I have also pinned the portal infrastructure image to a stable version as part of this merge, so that things are working well off the master branch. We'll be soon ready to update qa globally to master. I'll contact you when ready.

tiborsimko
tiborsimko approved these changes Oct 10, 2024
View reviewed changes
Copy link
Member

@tiborsimko tiborsimko left a comment

Choose a reason for hiding this comment

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

Thanks, the record is now deployed on QA: https://opendata-qa.cern.ch/record/49

(The documentation changes have not been fully deployed on QA yet due to an updating issue that we'll hopefully get to streamline in the next few days.)

@tiborsimko tiborsimko merged commit aca8f2b into cernopendata:master Oct 10, 2024
6 checks passed
@jmhogan jmhogan deleted the cms-docs-updates-on-qa branch October 10, 2024 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tiborsimko tiborsimko tiborsimko approved these changes

@katilp katilp katilp approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jmhogan @tiborsimko @katilp