robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Be explicit about generating release for images

Browse source 
The config now uses similar logic what previous commit did for OSTree.
Also we should report error when an unknown generator is used.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-04-07 15:33:43 +02:00
parent 0f4b6b1947
commit f6d07c1651
8 changed files with 148 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

47
doc/configuration.rst
View file

@ -929,8 +929,9 @@ will be provided according to :ref:`automatic versioning <auto-version>`.
* ``image_build_version``
* ``live_images_version``
Release is specified by these options. If set explicitly to ``None``, a value
will be generated according to :ref:`automatic versioning <auto-version>`.
Release is specified by these options. If set to a magic value to
``!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN``, a value will be generated according
to :ref:`automatic versioning <auto-version>`.
* ``global_release`` -- global fallback setting
* ``live_media_release``
@ -1001,9 +1002,10 @@ Live Media Settings
* ``ksurl`` (*str*)
* ``ksversion`` (*str*)
* ``scratch`` (*bool*)
* ``release`` (*str*) -- a string with the release, or explicit ``None``
for automatically generating one. See :ref:`automatic versioning
<auto-version>` for details.
* ``release`` (*str*) -- a string with the release, or
``!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN`` to automatically generate a
suitable value. See :ref:`automatic versioning <auto-version>` for
details.
* ``skip_tag`` (*bool*)
* ``repo`` (*str|[str]*) -- repos specified by URL or variant UID
* ``title`` (*str*)
@ -1013,29 +1015,6 @@ Live Media Settings
* ``repo_from`` -- deprecated, use ``repo`` instead
If many of your media use the same value for one of ``ksurl``, ``release``,
``target`` or ``version``, consider using these options to set the value in one
place and have all media inherit it.
**live_media_ksurl**
(*str*) -- Provides a fallback for media that do not specify ``ksurl`` in
the ``live_media`` block.
**live_media_release**
(*str*) -- Provides a fallback for media that do not specify ``release`` in
the ``live_media`` block. Please note that if you set this, there is no way
to unset it for a particular media. This is important if you want the
release generated by Koji.
**live_media_target**
(*str*) -- Provides a fallback for media that do not specify ``target`` in
the ``live_media`` block.
**live_media_version**
(*str*) -- Provides a fallback for media that do not specify ``version`` in
the ``live_media`` block.
Image Build Settings
====================
@ -1054,8 +1033,9 @@ Image Build Settings
automatically transformed into format suitable for ``koji``. A repo for the
currently built variant will be added as well.
If you explicitly set ``release`` to ``None``, it will be replaced with
a value generated as described in :ref:`automatic versioning <auto-version>`.
If you explicitly set ``release`` to
``!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN``, it will be replaced with a value
generated as described in :ref:`automatic versioning <auto-version>`.
Please don't set ``install_tree``. This gets automatically set by *pungi*
based on current variant. You can use ``install_tree_from`` key to use
@ -1136,7 +1116,7 @@ Example
'repo': ['Everything'],
# Set release automatically.
'release': None,
'release': '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN',
}
}
]
@ -1231,7 +1211,8 @@ an OSTree repository. This always runs in Koji as a ``runroot`` task.
* ``repo`` -- (*str|[str]*) repos specified by URL or variant UID
* ``release`` -- (*str*) Release value to set for the installer image. Set
to ``None`` to generate the value :ref:`automatically <auto-version>`.
to ``!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN`` to generate the value
:ref:`automatically <auto-version>`.
* ``failable`` -- (*[str]*) List of architectures for which this
deliverable is not release blocking.
@ -1268,7 +1249,7 @@ Example config
"https://example.com/extra-repo1.repo",
"https://example.com/extra-repo2.repo",
],
"release": None,
"release": "!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN",
"installpkgs": ["fedora-productimg-atomic"],
"add_template": ["atomic-installer/lorax-configure-repo.tmpl"],
"add_template_var": [