When adding a jenkins cartridge, the broker returns the following output. There is a ton of duplication and unnecessary info that clients have no way to simplify. The broker and node should agree on what data to return, and simplify. I would recommend the node *not* display a message about the cart being added, only the info the cart generates. I would recommend the broker be the one to provide the message about the cart being added: ----------- output of rhc add-cartridge jenkins -a foo -------------- Added jenkins-client-1.4 to application foo jenkins-client-1.4: Job URL: https://jenkins-abc.dev.rhcloud.com/job/foo-build/ Associated with job 'foo-build' in Jenkins server. Job URL: https://jenkins-abc.dev.rhcloud.com/job/foo-build/ Jenkins client 1.4 has been added to: foo --------------------------------------------------------------------- If node only returned Associated with job 'foo-build' in Jenkins server. Job URL: https://jenkins-abc.dev.rhcloud.com/job/foo-build/ And broker only returned Added jenkins-client-1.4 to application foo then we'd be much better off.
Also applies to remove cartridge for Jenkins: Removed jenkins-client-1.4 from application foo The corresponding job 'foo-build' in Jenkins has been disabled. You can re-enable or delete as desired. Job URL: https://jenkins-abc.dev.rhcloud.com/job/foo-build/ Jenkins client 1.4 has been removed from: foo The broker should be responsible for messaging about cart removal, the cart should only report about jobs.
Commit pushed to master at https://github.com/openshift/origin-server https://github.com/openshift/origin-server/commit/49aa5748afe50922afb022538de939408ac8b5e3 Bug 975530
https://github.com/openshift/origin-server/pull/3142
Verified on devenv_3545 The duplicate messages are now removed. Adding jenkins-client: jenkins-client-1.4 (Jenkins Client 1.4) --------------------------------------- Gears: Located with diy-0.1 Job URL: https://jks-jhou1.dev.rhcloud.com/job/d1-build/ Associated with job 'd1-build' in Jenkins server. Removing jenkins-client: The corresponding job 'd1-build' in Jenkins has been disabled. You can re-enable or delete as desired. Job URL: https://jks-jhou1.dev.rhcloud.com/job/d1-build/