Fix a conflict with UpgradeProperties (102X)

[kfjack]

PR description:

To avoid the conflict between the code in relval_steps.py and the Era/UpgradeProperties definition in upgradeWorkflowComponents.py. Attaching additional term to the Era definition in UpgradeProperties should not generate an error in the tests with this PR.

This is back port from PR #26151.

[cmsbuild]

A new Pull Request was created by @kfjack (Kai-Feng Chen) for CMSSW_10_2_X.

It involves the following packages:

Configuration/PyReleaseValidation

@cmsbuild, @zhenhu, @prebello, @pgunnell, @kpedro88 can you please review it and eventually sign? Thanks.
@makortel, @Martin-Grunewald this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

[prebello]

please test workflow 10801.0,10802.0,10803.0,10825.0

[cmsbuild]

The tests are being triggered in jenkins.

[cmsbuild]

+1
Tested at: ec71d4f
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-26152/33541/summary.html

[cmsbuild]

Comparison job queued.

[prebello]

Hi @fabiocos no problems. Locally I have changed the Era to inject usual relvals and it has called the ParkingBPH string by mistake. It has to be fixed to avoid issues with relvals not related to ParkingBPH data relvals.

[cmsbuild]

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-26152/33541/summary.html

@slava77 comparisons for the following workflows were not done due to missing matrix map:

• /build/cmsbld/jenkins/workspace/compare-root-files-short-matrix/results/JR-comparison/PR-26152/10801.0_SingleElectronPt10+SingleElectronPt10_pythia8_2018_GenSimFull+DigiFull_2018+RecoFull_2018+HARVESTFull_2018+ALCAFull_2018+NanoFull_2018

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 0 differences found in the comparisons
• DQMHistoTests: Total files compared: 31
• DQMHistoTests: Total histograms compared: 3007400
• DQMHistoTests: Total failures: 4
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 3007206
• DQMHistoTests: Total skipped: 190
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 30 files compared)
• Checked 129 log files, 14 edm output root files, 31 DQM output files

[fabiocos]

@prebello @zhenhu this needs your signature to move forward

[zhenhu]

+1

[fabiocos]

+1

the backport is consistent with the version merged in master
@kpedro88 you have signed master, I assume this is ok for you

[kpedro88]

+upgrade

[cmsbuild]

This pull request is fully signed and it will be integrated in one of the next CMSSW_10_2_X IBs (tests are also fine) and once validation in the development release cycle CMSSW_10_6_X is complete. This pull request will be automatically merged.