orca icon indicating copy to clipboard operation
orca copied to clipboard

feat(jenkins): Enable Jenkins job triggers for jobs in sub-folders (backport #4618)

Open mergify[bot] opened this issue 2 years ago • 1 comments

This is an automatic backport of pull request #4618 done by Mergify. Cherry-pick of 13c6f6ebffac383124fda7a838180d9fed97d4de has failed:

On branch mergify/bp/release-1.28.x/pr-4618
Your branch is up to date with 'origin/release-1.28.x'.

You are currently cherry-picking commit 13c6f6ebf.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   orca-igor/src/main/java/com/netflix/spinnaker/orca/igor/BuildService.java
	modified:   orca-igor/src/main/java/com/netflix/spinnaker/orca/igor/IgorService.java
	modified:   orca-igor/src/test/groovy/com/netflix/spinnaker/orca/igor/BuildServiceSpec.groovy

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   orca-igor/src/main/java/com/netflix/spinnaker/orca/igor/IgorFeatureFlagProperties.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

mergify[bot] avatar Jan 22 '24 11:01 mergify[bot]

Features cannot be merged into release branches. The following commits are not tagged as one of "fix, chore, docs, perf, test":

  • 04ca93bdf93873053d31598c18cc32afaf765d26: feat(jenkins): Enable Jenkins job triggers for jobs in sub-folders (#4618)

Read more about commit conventions and patch releases here.

spinnakerbot avatar Jan 22 '24 11:01 spinnakerbot