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

[14.1.X] Backport multi-arch chanegs from 15.0.X #9573

Merged
merged 1 commit into from
Dec 12, 2024

Conversation

smuzaffar
Copy link
Contributor

same as #9572

@smuzaffar
Copy link
Contributor Author

test parameters:

  • full_cmssw = true

@smuzaffar
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @smuzaffar for branch IB/CMSSW_14_1_X/master.

@aandvalenzuela, @cmsbuild, @iarspider, @smuzaffar can you please review it and eventually sign? Thanks.
@antoniovilela, @mandrenguyen, @rappoccio, @sextonkennedy you are the release manager for this.
cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 12, 2024

cms-bot internal usage

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-2a786d/43405/summary.html
COMMIT: e9ae703
CMSSW: CMSSW_14_1_X_2024-12-11-2300/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmsdist/9573/43405/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

@antoniovilela
Copy link

@smuzaffar
Will you need this for 14_1_7? If so, it would be good to merge today, so that we build tomorrow.

@smuzaffar
Copy link
Contributor Author

@antoniovilela , I would like to get this in for 14.2.X first.
OK, let me merge #9572 for 14.2.X first and I can trigger an IB now and if 14.2.X IB has no issues then I can merge this before 23h00 14.1.X IB

@antoniovilela
Copy link

@antoniovilela , I would like to get this in for 14.2.X first. OK, let me merge #9572 for 14.2.X first and I can trigger an IB now and if 14.2.X IB has no issues then I can merge this before 23h00 14.1.X IB

Sounds good

@smuzaffar
Copy link
Contributor Author

+externals

14.2.X IB looks good so lets merge this for 14.1.X

@smuzaffar smuzaffar merged commit e3bbb60 into IB/CMSSW_14_1_X/master Dec 12, 2024
10 checks passed
@cmsbuild
Copy link
Contributor

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

@antoniovilela
Copy link

@smuzaffar
Hi Shahzad, do you understand why we started having the unit test failure from FWCore/Integration ?

@smuzaffar
Copy link
Contributor Author

@antoniovilela , no idea but I am looking in to it

@antoniovilela
Copy link

antoniovilela commented Dec 13, 2024

@antoniovilela , no idea but I am looking in to it

Many thankks. We will wait a bit, before we launch the 14_2 & 15_0 builds.

@smuzaffar
Copy link
Contributor Author

I think cms-sw/cmssw-config@91e7bf6 change broke the python impor. I am reverting that change . Change was needed for runing edm class check during patch release built. We have a work around for that cms-sw/cmssw#46922 . Can you please integrate cms-sw/cmssw#46922 .

I will revert the cms-sw/cmssw-config@91e7bf6 foo all release cycles 14.1 and above

@antoniovilela
Copy link

I think cms-sw/cmssw-config@91e7bf6 change broke the python impor. I am reverting that change . Change was needed for runing edm class check during patch release built. We have a work around for that cms-sw/cmssw#46922 . Can you please integrate cms-sw/cmssw#46922 .

I will revert the cms-sw/cmssw-config@91e7bf6 foo all release cycles 14.1 and above

cms-sw/cmssw#46922 is merged.

Ok, we will wait for the revert.

@smuzaffar
Copy link
Contributor Author

smuzaffar commented Dec 13, 2024

@makortel , cms-sw/cmssw-config@91e7bf6 change was using the realpath of imported python package. This was done so that edm class check script can import FWCore.Reflection.ClassesDefXmlUtils during the build phase of patch release. This change broke TestIntegrationParameterSet unit test. Here is what python directory looks like in patch release

  • If FWCore is not part of patch release then we create symlink cmssw-patch/python/FWCore pointing to full release
cmssw-patch/python/FWCore  -- symlink to --> cmssw/python/FWCore
  • if FWCore is part of patch release then we create cmssw-patch/python/FWCore directory and create symlink for Integration
cmssw-patch/python/FWCore/Integration  -- symlink to --> cmssw/python/FWCore/Integration

After the cmssw-config update for python imports, in patch releases , imported python module path starts with

  • CMSSW_FULL_RELEASE_BASE: If package is not part of patch release
  • CMSSW_RELEASE_BASE: If package is part of patch release
  • CMSSW_BASE: In devel area, if patch was locally checkout

The reason unit test https://cmssdt.cern.ch/SDT/cgi-bin/logreader/el8_amd64_gcc12/CMSSW_15_0_X_2024-12-13-1100/unitTestLogs/FWCore/Integration#/3356-3356 start failing was that https://github.com/cms-sw/cmssw/blob/master/FWCore/ParameterSet/python/Config.py#L55 only allows CMSSW_RELEASE_BASE and CMSSW_BASE. For now I have reverted the cmssw-config change. But do you think we should update https://github.com/cms-sw/cmssw/blob/master/FWCore/ParameterSet/python/Config.py#L55 and also allow CMSSW_FULL_RELEASE_BASE ?

@smuzaffar
Copy link
Contributor Author

I have opened a cmssw issue for this

@smuzaffar smuzaffar deleted the smuzaffar-patch-12 branch December 18, 2024 14:35
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.

3 participants