The `org.osbuild.chrony` stage currently supports only a single option 'timeservers' which does not allow specifying additional options for the configured timeservers. The option can not be easily extended to allow specifying additional options and at the same time keep the backward compatibility with old manifests. The need for a lower-level stage option allowing to configure additional options of the 'server' directive is required by RHEL AMI images, which use 'maxpoll', 'minpoll' and 'prefered' options. Extend the `org.osbuild.chrony` stage with two additional options. The 'servers' option accepts a list of dictionaries specifying timeservers to be configured using the 'server' directive, including a subset of the directive options. The 'servers' option can not be used at the same time in the stage options as the 'timeservers' option. The second added option is 'leapsectz' corresponding with a directive of the same name. The value of the option is a string. If the provided string is empty, then all occurrences of the 'leapsectz' directive are removed from the `chrony.conf`. Otherwise, the 'leapsectz' directive is added to the `chrony.conf` with the provided value, while all original occurrences of the option are removed. Add a new stage test case under `test/data/stages/chrony-servers` to test the new variant of the stage options. The reason is that the 'timeservers' option conflicts with 'servers' option, which makes it impossible to test both of them in the same test case. Signed-off-by: Tomas Hozza <thozza@redhat.com> |
||
|---|---|---|
| .. | ||
| manifests | ||
| os-release | ||
| scripts | ||
| sources | ||
| stages | ||
| README.md | ||
OSBuild Test Data
This directory contains data used by the osbuild test-suite. Since many formats do not allow comments, this file shortly describes their purpose.
Directories
-
./os-release/: This directory is consumed by the unit-tests of theos-releaseparser. The directory contains example os-release files (seeos-release(5)). Their directory name is the expected output of the parser. -
./manifests/: This directory contains osbuild manifests used throughout the test-suite.Manifests prefixed with
f30,f31, etc. are manifests that produce fedora images. If they havebaseas part of their name, they include a base set of packages which we very loosely define as@coreplus the packages our test-suite needs. If they havebuildas part of their name, they have a very restricted package set which includes just what is needed in a build-root for osbuild. Thefedoraprefix is used for manifests that are kept up to date to the newest fedora release, and thus do not expose a specificf30,f32, etc. behavior.The
rhelprefix is used for Red Hat Enterprise Linux images. Since they are not available publicly, the test-suite usually skips them.The
filesystemmanifest is used to test assemblers. These tests doesn't need a big filesystem tree representing a whole operating system. Instead, this manifest's tree is constructed just from the filesystem package and is marked using the selinux stage.Manifests ending on
.mpp.jsonare fed through the ManifestPreProcessors and then stored in the same directory with an.jsonextension (replacing.mpp.json). generated files are committed to the repository. Nevertheless, if you need to regenerate them, usemake test-data. -
./sources/: This directory contains test-data for runtime tests of the source-engines. It contains a directory that is served via HTTP in the tests, and a directory of test-cases what to expect when using the attachedsources.json. -
scripts: This directory contains scripts used from other tests, i.e. although they are executables they are at the same time test-data to the actual (unit) tests.