Merge lp://qastaging/~sil2100/cupstream2distro/enhance_check_publish_conflicts into lp://qastaging/cupstream2distro
| Status: | Rejected |
|---|---|
| Rejected by: | Robert Bruce Park |
| Proposed branch: | lp://qastaging/~sil2100/cupstream2distro/enhance_check_publish_conflicts |
| Merge into: | lp://qastaging/cupstream2distro |
| Diff against target: |
83 lines (+29/-0) 4 files modified
citrain/manual/jenkins-templates/publish.xml.tmpl (+8/-0) citrain/prepare-silo (+1/-0) citrain/publisher (+11/-0) cupstream2distro/silomanager.py (+9/-0) |
| To merge this branch: | bzr merge lp://qastaging/~sil2100/cupstream2distro/enhance_check_publish_conflicts |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Needs Fixing | |
| Didier Roche-Tolomelli | Needs Information | ||
|
Review via email:
|
|||
Commit message
Add an additional safety check for the --ignore-conflicts in the publish job, so that no one publishes such a silo without double-checking if it makes sense.
Description of the change
Add an additional safety check for the --ignore-conflicts in the publish job, so that no one publishes such a silo without double-checking if it makes sense.
This is not a required change, it's simply a proposition. The drawback of this approach is that we add an additional field to the backend landing configs. I understand it's a big change for something that will be used really rarely, but on the other hand I can imagine how we publish something like this by accident otherwise ;)
| Didier Roche-Tolomelli (didrocks) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
Unmerged revisions
- 537. By Łukasz Zemczak
-
Add an additional safety check for the --ignore-conflicts in the publish job, so that no one publishes such a silo without double-checking if it makes sense.
Hum, is it needed? The first which ships win and we check the version at the destination before publishing, so if another conflicting silo published, this case is handled, isn't it?