zuul
/
zuul
Code Issues Proposed changes
zuul/tests/fixtures
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
..
auth JWT drivers: Deprecate RS256withJWKS, introduce OpenIDConnect 2020-02-11 09:30:15 +00:00
cgroup Add cgroup support to ram sensor 2018-12-18 22:25:27 +01:00
config Merge "Remove support for Ansible 2" 2022-09-23 17:31:54 +00:00
fingergw Combine fingergw certificate options 2021-07-27 15:38:49 -07:00
gerrit Update gerrit pagination test fixtures 2019-09-17 14:15:18 -07:00
layouts Change merge mode default based on driver 2022-10-13 10:31:19 -07:00
tenants Re-enable test_delayed_repo_init 2017-08-14 23:37:56 -07:00
app_key Exercise github auth handling in tests 2020-09-03 13:50:33 +02:00
clonemap.yaml cloner to easily clone dependent repositories 2014-07-29 09:03:59 +00:00
fake_git.sh Add comment explaining gitpython requirement 2017-10-10 11:15:06 -07:00
fake_kubectl.sh Stream output from kubectl pods 2020-02-27 07:49:40 -08:00
git_fail.sh Send merge completed events even in case of error 2021-08-19 10:21:21 -07:00
git_fetch_error.sh Merger: retry network operations 2018-01-31 13:20:36 -08:00
layout-cloner.yaml Case sensitive label matching 2017-07-27 07:46:35 +02:00
layout-connections-multiple-voters.yaml Add in extra connections tests 2015-12-06 14:48:32 +11:00
layout-disable-at.yaml Case sensitive label matching 2017-07-27 07:46:35 +02:00
layout-live-reconfiguration-functions.yaml Case sensitive label matching 2017-07-27 07:46:35 +02:00
layout-merge-queues.yaml Case sensitive label matching 2017-07-27 07:46:35 +02:00
layout-requirement-vote.yaml Case sensitive label matching 2017-07-27 07:46:35 +02:00
layout-smtp.yaml Case sensitive label matching 2017-07-27 07:46:35 +02:00
layout-success-pattern.yaml Add extra test for bad url patterns 2016-04-23 10:40:12 +10:00
private.pem Add per-repo public and private keys 2017-03-29 12:43:41 -07:00
public.pem Serve public keys through webapp 2017-03-29 12:44:43 -07:00
secrets.json Add commands to export/import keys to/from ZK 2021-08-24 10:07:41 -07:00
ssh.json Add commands to export/import keys to/from ZK 2021-08-24 10:07:41 -07:00
ssh.pem Create per-project ssh keys 2018-09-04 15:42:41 -07:00
ssh.pub Serve project SSH keys and document 2018-09-04 15:42:43 -07:00
test_id_rsa Add SSH Agent Primitives and usage 2017-05-26 09:52:22 -07:00
test_id_rsa.pub Add SSH Agent Primitives and usage 2017-05-26 09:52:22 -07:00
zuul-admin-web-no-override.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-admin-web-oidc.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-admin-web-token-expiry.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-admin-web.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-connections-cgit.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-connections-gerrit-and-github.conf Add pipeline timing metrics 2022-02-20 16:55:34 -08:00
zuul-connections-gitweb.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-connections-merger.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-connections-multiple-gerrits.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-connections-same-gerrit.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-crd-pagure.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-default-ansible-version.conf Remove support for Ansible 2 2022-09-14 17:14:10 -07:00
zuul-disk-accounting.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-elastic-driver.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-executor-ansible-callback.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-executor-governor.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-executor-hostname.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-gerrit-github.conf Support submitWholeTopic in Gerrit 2022-03-21 12:53:55 -07:00
zuul-gerrit-no-stream.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-gerrit-ssh.conf Add ssh_server option to Gerrit driver 2022-06-22 14:10:41 +00:00
zuul-gerrit-web.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-git-driver.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-github-driver-enterprise.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-github-driver.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-gitlab-driver-no-pool.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-gitlab-driver.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-hold-expiration.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-mqtt-driver.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-multi-github.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-pagure-driver-whitelist.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-pagure-driver.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-prometheus.conf Add readiness/liveness probes to prometheus server 2021-12-09 07:37:29 -08:00
zuul-push-reqs.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul-sql-driver-mysql.conf Add pipeline timing metrics 2022-02-20 16:55:34 -08:00
zuul-sql-driver-postgres.conf Add pipeline timing metrics 2022-02-20 16:55:34 -08:00
zuul-sql-driver-prefix-mysql.conf Remove "sql connection" backwards compatability for database 2022-01-25 16:07:08 -08:00
zuul-sql-driver-prefix-postgres.conf Remove "sql connection" backwards compatability for database 2022-01-25 16:07:08 -08:00
zuul-tracing.conf Add support for configuring and testing tracing 2022-09-19 08:42:28 +02:00
zuul-winrm.conf Remove gearman server 2022-01-25 06:44:17 -08:00
zuul.conf Remove gearman server 2022-01-25 06:44:17 -08:00