zuul
/
zuul
Code Issues Proposed changes
zuul/tests/fixtures/layouts
History
James E. Blair e2a472bc97 Change merge mode default based on driver 
The default merge mode is 'merge-resolve' because it has been observed
that it more closely matches the behavior of jgit in Gerrit (or, at
least it did the last time we looked into this).  The other drivers
are unlikely to use jgit and more likely to use the default git
merge strategy.

This change allows the default to differ based on the driver, and
changes the default for all non-gerrit drivers to 'merge'.

The implementation anticipates that we may want to add more granularity
in the future, so the API accepts a project as an argument, and in
the future, drivers could provide a per-project default (which they
may obtain from the remote code review system).  That is not implemented
yet.

This adds some extra data to the /projects endpoint in the REST api.
It is currently not easy (and perhaps not possible) to determine what a
project's merge mode is through the api.  This change adds a metadata
field to the output which will show the resulting value computed from
all of the project stanzas.  The project stanzas themselves may have
null values for the merge modes now, so the web app now protects against
that.

Change-Id: I9ddb79988ca08aba4662cd82124bd91e49fd053c
 		2022-10-13 10:31:19 -07:00
..
autohold.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
basic-git.yaml Git driver 2017-12-15 14:32:40 +01:00
basic-github.yaml Support merged as requirement in github driver 2018-05-16 07:43:50 +02:00
basic-gitlab.yaml Add support for adding and removing labels in gitlab 2022-01-14 18:18:35 +00:00
basic-pagure.yaml Pagure - add support for git.tag.creation event 2019-10-30 10:31:55 +01:00
branch-deletion.yaml Prune stale branches from mergers 2018-01-23 09:43:26 -08:00
broken-double-gate.yaml Raise an error if pipeline is defined twice 2019-01-26 08:11:15 +01:00
broken-template.yaml Fix broken templates for projects in dependent pipelines 2018-07-12 11:01:01 -07:00
circular-dependency-shared-queue-removed.yaml Only delete bundle items that aren't in ANY queue 2022-02-03 16:24:04 +01:00
circular-deps-node-failure.yaml Fix node request failures in dependency cycles 2022-05-02 13:57:15 -07:00
crd-github.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
crd-gitlab.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
crd-pagure.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
delayed-repo-init.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
dependent-github.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
deps-by-topic.yaml Add queue.dependencies-by-topic 2022-03-25 15:25:52 -07:00
dequeue-github.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
dequeue-reporting.yaml Report dequeued changes via Github checks API 2020-05-14 07:42:24 +02:00
disable_at.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
dont-ignore-ref-deletes.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
empty-check.yaml Query gerrit files endpoint 2021-09-08 17:14:58 -07:00
file-matchers.yaml Make file matchers overridable 2018-06-01 13:13:37 -07:00
files-github.yaml Fix bug in getting changed files 2022-04-25 15:05:48 -07:00
files-gitlab.yaml Add base_sha support to gitlab driver 2022-04-25 15:05:48 -07:00
files-pagure.yaml Add more files tests to Pagure driver 2022-04-25 15:05:48 -07:00
footer-message.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
freeze-job-failure.yaml Add config-error reporter and report config errors to DB 2022-08-22 14:35:25 -07:00
gate-github-cherry-pick.yaml Allow to select the merge method in Github 2019-06-11 12:08:07 +02:00
gate-github-squash-merge.yaml Support squash merge in Github 2019-06-11 12:08:07 +02:00
gate-github.yaml Status branch protection checking for github 2018-06-04 15:47:01 +02:00
gerrit-checks-nojobs.yaml Add 'comment' option to Gerrit reporter 2019-10-23 14:02:58 -07:00
gerrit-checks-scheme.yaml Add 'comment' option to Gerrit reporter 2019-10-23 14:02:58 -07:00
gerrit-checks.yaml Add 'comment' option to Gerrit reporter 2019-10-23 14:02:58 -07:00
gerrit-poll-post.yaml Gerrit: add polling support for refs 2020-02-06 09:08:16 -08:00
github-message-update.yaml Add a test for github dependency updates 2021-09-23 13:45:40 -07:00
gitlab-label-add-remove.yaml Add support for adding and removing labels in gitlab 2022-01-14 18:18:35 +00:00
idle.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
ignore-dependencies.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
inheritance.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
irrelevant-files.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
job-dedup-auto-shared.yaml Deduplicate jobs in dependency cycles 2022-05-24 09:35:14 -07:00
job-dedup-auto-unshared.yaml Deduplicate jobs in dependency cycles 2022-05-24 09:35:14 -07:00
job-dedup-auto.yaml Deduplicate jobs in dependency cycles 2022-05-24 09:35:14 -07:00
job-dedup-empty-nodeset.yaml Deduplicate jobs in dependency cycles 2022-05-24 09:35:14 -07:00
job-dedup-false.yaml Fix duplicate setResult calls in deduplicated builds 2022-07-25 13:22:19 -07:00
job-dedup-noop.yaml Do not deduplicate the noop job 2022-07-25 13:20:53 -07:00
job-dedup-parent-data.yaml Deduplicate jobs in dependency cycles 2022-05-24 09:35:14 -07:00
job-dedup-retry-child.yaml Deduplicate jobs in dependency cycles 2022-05-24 09:35:14 -07:00
job-dedup-retry.yaml Deduplicate jobs in dependency cycles 2022-05-24 09:35:14 -07:00
job-dedup-semaphore-first.yaml Deduplicate jobs in dependency cycles 2022-05-24 09:35:14 -07:00
job-dedup-semaphore.yaml Deduplicate jobs in dependency cycles 2022-05-24 09:35:14 -07:00
job-dedup-true.yaml Deduplicate jobs in dependency cycles 2022-05-24 09:35:14 -07:00
job-variants.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
job-vars.yaml Add variables to project 2018-07-26 17:46:26 -04:00
labeling-github.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
live-reconfiguration-del-pipeline.yaml Fix repo state restore / Keep jobgraphs frozen 2021-04-21 14:53:54 -07:00
live-reconfiguration-del-project.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
matcher-test.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
merge-conflict.yaml Rename MERGER_FAILURE to MERGE_CONFLICT 2022-02-24 17:06:03 -08:00
merge-failure.yaml Remove merge-failure pipeline configuration 2022-09-02 10:13:41 -07:00
merge-mode-default.yaml Change merge mode default based on driver 2022-10-13 10:31:19 -07:00
merging-github.yaml Rename MERGER_FAILURE to MERGE_CONFLICT 2022-02-24 17:06:03 -08:00
merging-gitlab-squash-merge.yaml Fix gitlab squash merge 2022-06-13 16:14:13 +02:00
merging-gitlab.yaml gitlab: support the merge reporter 2020-08-03 09:53:13 +00:00
merging-pagure.yaml Pagure driver - https://pagure.io/pagure/ 2019-06-17 14:18:19 -07:00
multi-scheduler-status.yaml Refresh pipeline change list and status when refreshing the state 2022-02-26 11:04:30 -08:00
multiple-semaphores.yaml Support multiple semaphores 2021-05-25 17:52:23 -07:00
multiple-templates.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
no-dequeue-on-new-patchset.yaml Add a test for dequeue-on-new-patchest 2021-09-23 14:12:35 -07:00
no-jobs-project.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
no-jobs-reporting.yaml Further no_job reporting fixes 2022-04-22 14:05:23 -07:00
no-jobs.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
no-run.yaml Validate that a job has a run playbook on freeze 2017-10-26 16:05:22 -07:00
no-timer-github.yaml Fix repo state restore / Keep jobgraphs frozen 2021-04-21 14:53:54 -07:00
no-timer-gitlab.yaml Fix gitlab timer events 2022-03-15 13:44:35 -07:00
no-timer.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
nodeset-alternatives.yaml Add nodeset alternatives 2022-09-08 13:01:28 -07:00
nodeset-fallback.yaml Add nodeset alternatives 2022-09-08 13:01:28 -07:00
nonvoting-job-approval.yaml Fix zuul reporting build failure with only non-voting jobs 2018-07-25 10:59:40 -04:00
nonvoting-job.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
nonvoting-pipeline.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
noop-job.yaml Case sensitive label matching 2017-07-27 07:46:35 +02:00
not-skip-when-reenqueue.yaml Fix a bug that re-enqueue may skip soft dependent jobs 2022-04-27 11:50:27 +02:00
one-job-project.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
overlapping-repos.yaml Support overlapping repos and a flat workspace scheme 2021-04-29 17:56:24 -07:00
parent-matchers.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
pipeline-supercedes.yaml Add "supercedes" pipeline option 2019-07-15 08:34:09 -07:00
provides-requires-single-project.yaml Required SQL reporters 2021-02-03 13:41:55 -08:00
provides-requires-two-jobs.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
provides-requires-unshared.yaml Add provides/requires support 2019-01-30 14:07:42 -08:00
provides-requires.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
push-tag-github.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
rate-limit-reconfigure.yaml Fix exceptions on reconfig with changing window 2019-12-04 08:05:51 +01:00
rate-limit-reconfigure2.yaml Fix exceptions on reconfig with changing window 2019-12-04 08:05:51 +01:00
rate-limit.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
reconfigure-failed-head.yaml On reconfiguration, re-enqueue items at the same position 2017-10-31 17:01:09 -07:00
reconfigure-window-fixed.yaml Don't shrink windows on reconfiguration 2017-12-01 09:42:14 -08:00
reconfigure-window-fixed2.yaml Don't shrink windows on reconfiguration 2017-12-01 09:42:14 -08:00
reconfigure-window.yaml Remove nodesets from builds canceled during reconfiguration 2017-11-30 14:48:40 -08:00
reconfigure-window2.yaml Remove nodesets from builds canceled during reconfiguration 2017-11-30 14:48:40 -08:00
regex-queue.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
regex-template-queue.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
repo-checkout-four-project.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
repo-checkout-no-timer-override.yaml Add support for override-checkout, deprecate override-branch 2017-10-30 15:00:11 -07:00
repo-checkout-no-timer.yaml Add support for override-checkout, deprecate override-branch 2017-10-30 15:00:11 -07:00
repo-checkout-post.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
repo-checkout-six-project.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
repo-checkout-tag.yaml Add support for override-checkout, deprecate override-branch 2017-10-30 15:00:11 -07:00
repo-checkout-timer-override.yaml Add support for override-checkout, deprecate override-branch 2017-10-30 15:00:11 -07:00
repo-checkout-timer.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
repo-checkout-two-project.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
repo-deleted.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
reporting-github.yaml Add skipped / neutral statuses to the github driver 2021-06-25 14:48:16 -04:00
reporting-multiple-github.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
requirements-github.yaml Allow check runs to be configured as required status in pipeline config 2020-05-12 16:48:16 +02:00
requirements-gitlab.yaml Required gitlab labels is subset of set labels 2022-01-14 18:53:39 +00:00
requirements-pagure.yaml pagure: Improve CI status flag handling 2020-04-07 14:08:33 +02:00
reviews-github.yaml Add support for submitting reviews on GitHub 2019-04-30 09:43:08 -07:00
semaphore-multi-pipeline.yaml Trigger pipeline runs when semaphores release 2022-03-03 16:27:25 -08:00
semaphore.yaml Fix erroneous semaphore leak cleanup 2021-12-14 16:38:57 -08:00
serial.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
simple.yaml Add a model API version 2022-01-27 12:19:11 -08:00
single-file-matcher.yaml Fix gerrit errors from production 2019-09-20 07:26:04 -07:00
single-job-with-nodeset.yaml Ensure job.queued is correct after reconfig 2020-02-24 07:44:12 -08:00
smtp.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
soft-dependencies-error.yaml Allow soft job dependencies 2019-03-07 13:21:22 -08:00
soft-dependencies.yaml Allow soft job dependencies 2019-03-07 13:21:22 -08:00
sos-circular.yaml Deduplicate jobs in dependency cycles 2022-05-24 09:35:14 -07:00
special-characters-job.yaml Fix links for jobs with special characters 2022-08-23 13:21:25 +02:00
start-message.yaml Add support for item.change for pipeline start-message formater 2019-06-20 16:42:40 +02:00
submitted-together-per-branch.yaml Report per-branch cyclic-dependency conflicts 2022-03-21 12:54:02 -07:00
success-message.yaml Restore job success/failure message 2021-08-13 07:57:12 -07:00
supercedent-promote.yaml Check branches in supercedent pipelines 2019-04-05 13:59:05 -07:00
supercedent.yaml Add supercedent pipeline manager 2018-06-14 16:32:03 -07:00
tags.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
template-project-queue.yaml Move queue from pipeline to project 2021-02-03 13:04:20 +01:00
template-queue.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
three-projects.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
timer-freeze-job-failure.yaml Add config-error reporter and report config errors to DB 2022-08-22 14:35:25 -07:00
timer-github.yaml Fix AttributeError when handle periodic job with github driver 2018-02-05 15:16:15 +08:00
timer-gitlab.yaml Fix gitlab timer events 2022-03-15 13:44:35 -07:00
timer-jitter.yaml Fix Test Case "TestScheduler.test_timer_with_jitter" 2020-01-22 10:34:38 +01:00
timer-smtp.yaml Always report the build page 2021-07-15 16:45:58 -07:00
timer-template.yaml timer: do not skip projects using pipeline from template 2018-08-08 10:48:08 +00:00
timer.yaml timer: skip projects not using the pipeline 2018-07-11 06:13:12 +00:00
trigger-sequence.yaml Strictly sequence reconfiguration events 2022-07-18 10:51:59 -07:00
two-projects-integrated.yaml Remove deprecated pipeline queue configuration 2022-09-08 13:32:11 -07:00
unmanaged-project.yaml Case sensitive label matching 2017-07-27 07:46:35 +02:00
untrusted-secrets.yaml Update test fixtures to use explicit run 2017-10-26 15:59:41 -07:00
vars.yaml Store FrozenJob data in separate znodes 2021-10-27 16:57:22 -07:00