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

Herwig++: Add new cm energy and fix a typo #12638

Merged
merged 6 commits into from
Dec 3, 2015

Conversation

mharrend
Copy link
Contributor

@mharrend mharrend commented Dec 2, 2015

No description provided.

Marco A. Harrendorf added 3 commits December 2, 2015 13:30
@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 2, 2015

A new Pull Request was created by @mharrend (Marco A. Harrendorf) for CMSSW_8_0_X.

It involves the following packages:

Configuration/Generator

@vciulli, @covarell, @thuer, @cmsbuild, @bendavid, @davidlange6, @govoni can you please review it and eventually sign? Thanks.
@ghellwig, @Martin-Grunewald this is something you requested to watch as well.
@slava77, @Degano, @smuzaffar you are the release manager for this.

Following commands in first line of a comment are recognized

  • +1|approve[d]|sign[ed]: L1/L2's to approve it
  • -1|reject[ed]: L1/L2's to reject it
  • assign <category>[,<category>[,...]]: L1/L2's to request signatures from other categories
  • unassign <category>[,<category>[,...]]: L1/L2's to remove signatures from other categories
  • hold: L1/all L2's/release manager to mark it as on hold
  • unhold: L1/user who put this PR on hold
  • merge: L1/release managers to merge this request
  • [@cmsbuild,] please test: L1/L2 and selected users to start jenkins tests
  • [@cmsbuild,] please test with cms-sw/cmsdist#<PR>: L1/L2 and selected users to start jenkins tests using externals from cmsdist

Marco A. Harrendorf added 2 commits December 2, 2015 13:41
@mharrend
Copy link
Contributor Author

mharrend commented Dec 2, 2015

I added also a config for the CUETHppS1 tune provided by Paolo Gunnellini-

@bendavid
Copy link
Contributor

bendavid commented Dec 2, 2015

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 2, 2015

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/10076/console

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 2, 2015

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_0_X IBs after it passes the integration tests. This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @Degano, @smuzaffar

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 2, 2015

-1
Tested at: 1e6f60d
I found an error when building:

gmake[1]: **\* [CompilePython] Error 1
gmake[1]: Target `PostBuild' not remade because of errors.
gmake[1]: Leaving directory`/tmp/cmsbuild/workspace/ib-any-integration/CMSSW_8_0_X_2015-12-01-2300'
gmake: **\* [src] Error 2
gmake: Target `all' not remade because of errors.
gmake: **\* [There are compilation/build errors. Please see the detail log above.] Error 2


you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-12638/10076/summary.html

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
1e6f60d
6b43ba1
188a7f5
b7c7168
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-12638/10076/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-12638/10076/git-merge-result

…2TeV_cfi.py

Change name to fix compilation error.
@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 2, 2015

Pull request #12638 was updated. @vciulli, @covarell, @thuer, @cmsbuild, @bendavid, @davidlange6, @govoni can you please check and sign again.

@mharrend
Copy link
Contributor Author

mharrend commented Dec 2, 2015

Fixed the compilation error.

@covarell
Copy link
Contributor

covarell commented Dec 2, 2015

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 2, 2015

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/10089/console

@mharrend
Copy link
Contributor Author

mharrend commented Dec 2, 2015

The compilation error should now be fixed.

@covarell
Copy link
Contributor

covarell commented Dec 2, 2015

:-) "pls test" is not for you, it is a statement triggering automatic test

@mharrend
Copy link
Contributor Author

mharrend commented Dec 2, 2015

okay sorry. :-)

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 2, 2015

@covarell
Copy link
Contributor

covarell commented Dec 2, 2015

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 2, 2015

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_0_X IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @Degano, @smuzaffar

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 2, 2015

@davidlange6
Copy link
Contributor

+1

cmsbuild added a commit that referenced this pull request Dec 3, 2015
Herwig++: Add new cm energy and fix a typo
@cmsbuild cmsbuild merged commit f0b8ebb into cms-sw:CMSSW_8_0_X Dec 3, 2015
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