diff options
| author | James E. Blair <jim@acmegating.com> | 2022-11-09 16:22:34 -0800 |
|---|---|---|
| committer | James E. Blair <jim@acmegating.com> | 2022-11-11 09:53:28 -0800 |
| commit | 640059a67a68c8d2d9843765d586d7845e7648a9 (patch) | |
| tree | 8771c29f38bd859bd55765a9e950a421508dfd82 /doc | |
| parent | 1245d100ca8ca3f206c33ecb9817a65daa65729d (diff) | |
| download | zuul-640059a67a68c8d2d9843765d586d7845e7648a9.tar.gz | |
Report a config error for unsupported merge mode
This updates the branch cache (and associated connection mixin)
to include information about supported project merge modes. With
this, if a project on github has the "squash" merge mode disabled
and a Zuul user attempts to configure Zuul to use the "squash"
mode, then Zuul will report a configuration syntax error.
This change adds implementation support only to the github driver.
Other drivers may add support in the future.
For all other drivers, the branch cache mixin simply returns a value
indicating that all merge modes are supported, so there will be no
behavior change.
This is also the upgrade strategy: the branch cache uses a
defaultdict that reports all merge modes supported for any project
when it first loads the cache from ZK after an upgrade.
Change-Id: I3ed9a98dfc1ed63ac11025eb792c61c9a6414384
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/developer/model-changelog.rst | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/source/developer/model-changelog.rst b/doc/source/developer/model-changelog.rst index c6d8fedbd..a14ff9895 100644 --- a/doc/source/developer/model-changelog.rst +++ b/doc/source/developer/model-changelog.rst @@ -100,3 +100,9 @@ Version 10 :Prior Zuul version: 6.4.0 :Description: Renames admin_rules to authz_rules in unparsed abide. Affects schedulers and web. + +Version 11 +---------- + +:Prior Zuul version: 8.0.1 +:Description: Adds merge_modes to branch cache. Affects schedulers and web. |