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

Updated GTs in AutoCond.py for CMSSW_7_0_0_pre13 #2251

Merged
merged 1 commit into from Jan 31, 2014

Conversation

rcastello
Copy link

Fixing the autoCond.py with the correct GTs for 7_0_0_pre13 containing

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @rcastello (Roberto Castello) for CMSSW_7_0_X.

Updated GTs in AutoCond.py for CMSSW_7_0_0_pre13

It involves the following packages:

Configuration/AlCa

@cmsbuild, @Degano, @diguida, @rcastello, @nclopezo can you please review it and eventually sign? Thanks.
@ghellwig this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@ktf you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@ktf
Copy link
Contributor

ktf commented Jan 31, 2014

This does not merge.
Is this the fix for the recent issues in the addOn tests?

@diguida
Copy link
Contributor

diguida commented Jan 31, 2014

Hi @ktf !
This is the new set of GTs (hopefully the final one) for 7.0.0, and contains also the same change as in #2181. The latter PR is superseded by #2110 which contains the HLT GT change, and also the fix for the addOnTests: it was merged yesterday, so I suppose we should rebase.

@ktf
Copy link
Contributor

ktf commented Jan 31, 2014

Yes, please.

@diguida
Copy link
Contributor

diguida commented Jan 31, 2014

Ok, doing it right now.
@rcastello do you want me to do it, or do you want to rebase it by yourself?

@diguida
Copy link
Contributor

diguida commented Jan 31, 2014

Hi!
Weird error when rebasing:

 cmsrel CMSSW_7_0_X_2014-01-31-0200
 cd CMSSW_7_0_X_2014-01-31-0200/src
 cmsenv
 git cms-init
 git remote add rcastello git@github.com:rcastello/cmssw.git
 git fetch rcastello
 git co rcastello/AutoCondGTupdate-700pre13
 git co -b AutoCondGTupdate-700pre13
 git rebase -i CMSSW_7_0_X
 error: addinfo_cache failed for path 'RecoTauTag/RecoTau/interface/AntiElectronIDMVA5GBR.h'
 error: addinfo_cache failed for path 'RecoTauTag/ImpactParameter/plugins/ImpactParameter.cc'
 error: could not apply ab25d99... Updated GTs for CMSSW_7_0_0_pre13
 ...

Browsing a bit, it seems like a bug. Should I try merging and squashing, or start from scratch?

@ktf
Copy link
Contributor

ktf commented Jan 31, 2014

Ignore it.

@diguida
Copy link
Contributor

diguida commented Jan 31, 2014

@ktf
Conflict solved, pushed in my repo. How can I update the PR, or can I open a new one?

@ktf
Copy link
Contributor

ktf commented Jan 31, 2014

You need to open a new one (or ask roberto to allow you to modify his branches).

@diguida
Copy link
Contributor

diguida commented Jan 31, 2014

@ktf thanks for the help!
@rcastello is rebasing and pushing under my "supervision".

Conflicts:
	Configuration/AlCa/python/autoCond.py
@rcastello
Copy link
Author

@ktf : rebase is done

@cmsbuild
Copy link
Contributor

Pull request #2251 was updated. @cmsbuild, @Degano, @diguida, @rcastello, @nclopezo can you please check and sign again.

ktf added a commit that referenced this pull request Jan 31, 2014
AlCa update -- Updated GTs in AutoCond.py for CMSSW_7_0_0_pre13
@ktf ktf merged commit f1092b0 into cms-sw:CMSSW_7_0_X Jan 31, 2014
@ktf
Copy link
Contributor

ktf commented Jan 31, 2014

Bypassing signature since it came from you. Please do not forget to +1!

@diguida
Copy link
Contributor

diguida commented Jan 31, 2014

The PR passed our tests yesterday night, so it should be OK. Let's wait for @cmsbuild to give another look!

@diguida
Copy link
Contributor

diguida commented Jan 31, 2014

+1
Signing in order to build the release.

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.

None yet

5 participants