]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commit
teuthology/suite: merge base_config with other fragments
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 18 Oct 2024 12:44:13 +0000 (08:44 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 23 Oct 2024 01:18:09 +0000 (21:18 -0400)
commitd05aa26b35c50545ecebeb0467ec8a68adcc65fa
tree1da0c2c9d4917efd72bd123efcb0e67a33f1b4bb
parent5bac476685eacea5a62f470286b7af6032f2a687
teuthology/suite: merge base_config with other fragments

Presently the code tries to merge the base_config when the worker starts
running. There's no need to construct it this way and it prevents sharing the
"defaults" with the fragment merging infrastructure. It also prevents
overriding defaults like:

    kernel
        branch: wip-pdonnell-i66704
        client:
            branch: wip-pdonnell-i66704
            flavor: default
            kdb: 1
            sha1: 745cacd8f31e50d7f3b6039bbd8c9a8dfc07bf03
        flavor: default
        kdb: 1
        sha1: 745cacd8f31e50d7f3b6039bbd8c9a8dfc07bf03

A YAML fragment can set kernel.client but it cannot delete the defaults for
kernel.(branch|flavor|kdb|sha1) because there's no way to remove YAML elements
via a deep merge.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
teuthology/suite/merge.py
teuthology/suite/run.py
teuthology/suite/test/test_run_.py