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

[JENKINS-72112] Allow merge strategy inheritance in PodTemplates #1513

Merged

Conversation

georgblumenschein
Copy link
Contributor

Ticket: https://issues.jenkins.io/browse/JENKINS-72112

Note

This Pull Request is taken from #1448 and the changes done there!
I was not quite sure what the workflow in such cases is, I could also open a PR on the fork so that the first forker can update the PR here, I just assumed it is simpler this way.

Testing done

Testing done in #1448, I am fixing (at least I try ;-) ) the automated tests that prevent it from merging.

Submitter checklist

Edit tasklist title
Beta Give feedback Tasklist Submitter checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
    Options
  2. Ensure that the pull request title represents the desired changelog entry
    Options
  3. Please describe what you did
    Options
  4. Link to relevant issues in GitHub or Jira
    Options
  5. Link to relevant pull requests, esp. upstream and downstream changes
    Options
  6. Ensure you have provided tests - that demonstrates feature works or fixes the issue
    Options
Loading

@georgblumenschein georgblumenschein marked this pull request as ready for review February 26, 2024 16:47
@georgblumenschein georgblumenschein requested a review from a team as a code owner February 26, 2024 16:47
@georgblumenschein
Copy link
Contributor Author

Two notes:
I had to rebase to get the pipeline green, meaning it looks like I did that, but credit for 99% of the work goes to @vivienfricadelamadeus
Failing test seems to be flaky with a problem pulling the busybox image, all checks ran through before I squashed them, so a retrigger should resolve this.

@Vlatombe Vlatombe self-assigned this Mar 7, 2024
@Vlatombe Vlatombe added feature New features enhancement Improvements and removed feature New features labels Mar 7, 2024
georgblumenschein and others added 3 commits March 13, 2024 07:38
…Template/help-inheritYamlMergeStrategy.html

Co-authored-by: Vincent Latombe <vincent@latombe.net>
…Template/config.jelly

Co-authored-by: Vincent Latombe <vincent@latombe.net>
…Template/config.jelly

Co-authored-by: Vincent Latombe <vincent@latombe.net>
@Vlatombe Vlatombe merged commit a1647c2 into jenkinsci:master Mar 15, 2024
6 checks passed
@georgblumenschein georgblumenschein deleted the improvement/JENKINS-72112 branch March 18, 2024 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Improvements
Projects
None yet
2 participants