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

Enhance Custom Message Functionality #169

Closed
wants to merge 1 commit into from
Closed

Enhance Custom Message Functionality #169

wants to merge 1 commit into from

Conversation

csogilvie
Copy link

This enhances the custom message functionality to include both a default custom message, if defined, and a specific custom message per build failure types.

@jenkinsadmin
Copy link
Member

Thank you for this pull request! Please check this document for how the Jenkins project handles pull requests.

@oppai
Copy link

oppai commented Jan 5, 2016

👍

@Nooba
Copy link

Nooba commented Jan 29, 2016

Was looking for this. Thanks! I'll test it asap.

@brandonroeder
Copy link

Any update on this?

1 similar comment
@markusbergh
Copy link

Any update on this?

@kmadel
Copy link
Contributor

kmadel commented Mar 7, 2016

Need at least two thumbs up if this is going to make it into 2.0

@brandonroeder
Copy link

Well here's one thumb 👍

@kmadel kmadel added this to the slack-2.1 milestone Mar 15, 2016
@samrocketman
Copy link
Member

Needs to be updated to resolve conflicts.

@samrocketman
Copy link
Member

Seems to fix issue #163.

@csogilvie
Copy link
Author

I have updated this branch with the conflicts resolved.

@samrocketman
Copy link
Member

All I see is:

This branch is out-of-date with the base branch
Merge the latest changes from master into this branch.

@csogilvie
Copy link
Author

Unless I've missed something, this is merged now, according to Github - although it's pending the Jenkins validation at the moment.

@samrocketman
Copy link
Member

Would you mind rebasing to discard the merge commits? e.g.

cd /path/to/your/slack-plugin
git checkout variable-custom-messages
git remote add upstream git@github.com:jenkinsci/slack-plugin.git
git fetch upstream
git rebase upstream/master
git push origin variable-custom-messages --force

The rebase will auto-discard the merge commits.

@csogilvie
Copy link
Author

Done - sorry, my first time using git in anger :)

@samrocketman
Copy link
Member

Thanks. I'll let Kurt perform the merge. Definitely much cleaner.

@csogilvie
Copy link
Author

Any update on this?

@samrocketman
Copy link
Member

@kmadel ^^

@ElijahLynn
Copy link

@csogilvie Can you get this rebased off master again? It isn't mergeable right now.

@csogilvie
Copy link
Author

I will rebase, test and verify this again, however, this time I would like to see some action on it, rather than it just hanging around... as it is not a good way to encourage contributors :(

@csogilvie
Copy link
Author

This seems to check out OK from my testing.

@ElijahLynn
Copy link

@csogilvie Thanks! I will try to get this tested out soon. Our Jenkin's looks like it needs to be updated in order to use the 2.x version of this plugin. Gotta get that updated now.

@csogilvie
Copy link
Author

I have rebased this again today as I noticed it had an issue.

@kmadel
Copy link
Contributor

kmadel commented Nov 7, 2016

Please fix merge conflicts

@csogilvie
Copy link
Author

Done, again.

@kmadel kmadel added this to the slack-2.2 milestone Nov 14, 2016
This enhances the custom message functionality to include both a default custom message, if defined, and a specific custom message per build failure types.
@csogilvie
Copy link
Author

I have squashed these and rebased it.

@samrocketman
Copy link
Member

Awesome I'll test/merge this evening.

Copy link
Member

@samrocketman samrocketman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't be merged as-is

After thorough testing. Upgrading the plugin with this version completely breaks all existing configurations in Jenkins. Until your change properly handles configuration migrations I can't approve merging it. If it were merged and released then it would effectively break any Jenkins installation with slack already configured when they go to upgrade.

Please address configuration migration.

Test yourself

$ mvn --version
Apache Maven 3.3.9 (bb52d8502b132ec0a5a3f4c09453c07478323dc5; 2015-11-10T08:41:47-08:00)
Maven home: /home/sam/usr/share/apache-maven-3.3.9
Java version: 1.7.0_79, vendor: Oracle Corporation
Java home: /home/sam/usr/share/java/jdk1.7.0_79/jre
Default locale: en_US, platform encoding: UTF-8
OS name: "linux", version: "4.4.0-64-generic", arch: "amd64", family: "unix"
  1. Install Maven and ensure mvn is in your $PATH.

  2. Bootstrap Jenkins with slack (it is already configured for https://jenkins-slack-plugin.slack.com/ ).

  3. Run through a build sequence of jobs:

    1. Test (with parameters): fail checked, unstable unchecked
    2. Test: fail unchecked, unstable checked
    3. Test: fail unchecked, unstable unchecked
    4. Jervis
    5. Slack
  4. Upgrade Jenkins to Slack plugin 2.2-SNAPSHOT built from merging your change into master and run through the build sequence of jobs in Step 3 of this list.

Slack output (before plugin upgrade)

  • Slack 2.1 installed

screenshot_20170228_224637

Slack output (after plugin upgrade)

screenshot_20170228_224657

@samrocketman
Copy link
Member

samrocketman commented Mar 1, 2017

@csogilvie I've posted my review. Let me know if you have any questions. As soon as a plugin upgrade cleanly upgrades (without affecting existing configurations), I will consider it good to merge.

For how to configure migrations refer to past pull requests: https://github.com/jenkinsci/slack-plugin/pulls?q=is%3Apr+migrate+is%3Aclosed

@hsson
Copy link

hsson commented Nov 27, 2017

Is there any progress update on this, @csogilvie ? It's a feature that would be really great to have for our use cases.

@oshmyrko
Copy link

👍

1 similar comment
@MikePryn
Copy link

👍

@AnneTheAgile
Copy link

AnneTheAgile commented Oct 3, 2018

@kmadel is there a way for regular users who haven't checked out to see what the conflict is?
@csogilvie possibly is occupied, though started this and did many updates before you came and started newly maintaining.
//this PR might be able to handle a superset of ;
Append N lines from end of console log #304

@kmadel
Copy link
Contributor

kmadel commented Oct 7, 2018

I will take a look once you merge changes from masters, looks like parts of this were already added/fixed by other merges.

@timja
Copy link
Member

timja commented Nov 28, 2018

Closing this now to clean up the repo,
if this is still wanted, please resolve conflicts and reopen

@timja timja closed this Nov 28, 2018
KreAch3R added a commit to KreAch3R/slack-plugin that referenced this pull request Dec 16, 2018
Original idea from jenkinsci#169
(Enhance Custom Message Functionality by @csogilvie)

Discussion in jenkinsci#385

I re-wrote it almost completely on top of the current master
@chadmccathie
Copy link

This feature is a must for this plugin. Thanks for getting the ball rolling again KreAch3R

KreAch3R added a commit to KreAch3R/slack-plugin that referenced this pull request Dec 17, 2018
Original idea from jenkinsci#169
(Enhance Custom Message Functionality by @csogilvie)

Discussion in jenkinsci#385

I re-wrote it almost completely on top of the current master
KreAch3R added a commit to KreAch3R/slack-plugin that referenced this pull request Dec 17, 2018
Original idea from jenkinsci#169
(Enhance Custom Message Functionality by @csogilvie)

Discussion in jenkinsci#385

I re-wrote it almost completely on top of the current master
timja pushed a commit that referenced this pull request Dec 17, 2018
Original idea from #169
(Enhance Custom Message Functionality by @csogilvie)

Discussion in #385

I re-wrote it almost completely on top of the current master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet