Release 4.7.0

JIRA: RHELCMP-13991 Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
kiwibuild: Add support for type, type attr and bundle format
2024-08-20 14:49:59 +02:00 · 2024-08-20 12:31:53 +00:00 · 2024-08-14 11:09:37 +02:00 · 2024-08-07 13:34:02 +02:00 · 2024-08-06 09:15:17 +02:00 · 2024-08-05 10:55:08 +00:00
113 changed files with 4114 additions and 4691 deletions
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -2,6 +2,7 @@ include AUTHORS
 include COPYING
 include GPL
 include pungi.spec
+include setup.cfg
 include tox.ini
 include share/*
 include share/multilib/*
--- a/1
+++ b/1
@ -47,7 +47,6 @@ Split Pungi into smaller well-defined tools

 * create install images
  * lorax
-  * buildinstall

 * create isos
  * isos
--- a/contrib/tmpfiles.d/pungi-clean-cache.conf
+++ b/contrib/tmpfiles.d/pungi-clean-cache.conf
@ -0,0 +1,2 @@
+# Clean up pungi cache
+d /var/cache/pungi/createrepo_c/ - - - 30d
--- a/doc/_static/phases.svg
+++ b/doc/_static/phases.svg
@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="610.46454"
-   height="301.1662"
-   viewBox="0 0 610.46457 301.1662"
+   height="327.16599"
+   viewBox="0 0 610.46457 327.16599"
   id="svg2"
   version="1.1"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
   sodipodi:docname="phases.svg"
   inkscape:export-filename="/home/lsedlar/repos/pungi/doc/_static/phases.png"
   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
@ -25,15 +25,15 @@
     inkscape:pageopacity="1"
     inkscape:pageshadow="2"
     inkscape:zoom="1.5"
-     inkscape:cx="9.4746397"
-     inkscape:cy="58.833855"
+     inkscape:cx="268"
+     inkscape:cy="260.66667"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="false"
-     inkscape:window-width="2560"
-     inkscape:window-height="1376"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="25"
     inkscape:window-maximized="1"
     units="px"
     inkscape:document-rotation="0"
@ -43,7 +43,10 @@
     fit-margin-left="7.4"
     fit-margin-right="7.4"
     fit-margin-bottom="7.4"
-     lock-margins="true" />
+     lock-margins="true"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
  <defs
     id="defs4">
    <marker
@ -70,7 +73,6 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
      </cc:Work>
    </rdf:RDF>
  </metadata>
@ -103,7 +105,7 @@
           style="font-size:13.1479px;line-height:1.25">Pkgset</tspan></text>
    </g>
    <g
-       transform="translate(58.253953,-80.817124)"
+       transform="translate(56.378954,-80.817124)"
       id="g3398">
      <rect
         y="553.98242"
@ -301,25 +303,29 @@
        </g>
      </g>
    </g>
-    <rect
-       transform="matrix(0,1,1,0,0,0)"
-       style="fill:#e9b96e;fill-rule:evenodd;stroke:none;stroke-width:1.85901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect3338-1"
-       width="90.874992"
-       height="115.80065"
-       x="872.67383"
-       y="486.55563" />
-    <text
-       id="text3384-0"
-       y="921.73846"
-       x="489.56451"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-size:13.1475px;line-height:1.25"
-         id="tspan3391"
-         sodipodi:role="line"
+    <g
+       id="g2"
+       transform="translate(-1.4062678e-8,9.3749966)">
+      <rect
+         transform="matrix(0,1,1,0,0,0)"
+         style="fill:#e9b96e;fill-rule:evenodd;stroke:none;stroke-width:1.85901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="rect3338-1"
+         width="103.12497"
+         height="115.80065"
+         x="863.29883"
+         y="486.55563" />
+      <text
+         id="text3384-0"
+         y="921.73846"
         x="489.56451"
-         y="921.73846">ImageChecksum</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-size:13.1475px;line-height:1.25"
+           id="tspan3391"
+           sodipodi:role="line"
+           x="489.56451"
+           y="921.73846">ImageChecksum</tspan></text>
+    </g>
    <g
       transform="translate(-42.209584,-80.817124)"
       id="g3458">
@ -417,16 +423,16 @@
       id="rect290"
       width="26.295755"
       height="224.35098"
-       x="1063.5973"
+       x="1091.7223"
       y="378.43698"
       transform="matrix(0,1,1,0,0,0)" />
    <text
       xml:space="preserve"
       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="380.74133"
-       y="1080.3723"
+       y="1106.6223"
       id="text294"><tspan
-         y="1080.3723"
+         y="1106.6223"
         x="380.74133"
         sodipodi:role="line"
         id="tspan301"
@ -454,32 +460,9 @@
           y="1069.0087"
           id="tspan3812">ExtraIsos</tspan></text>
    </g>
-    <g
-       id="g1031"
-       transform="translate(-40.740337,29.23522)">
-      <rect
-         transform="matrix(0,1,1,0,0,0)"
-         style="fill:#5ed4ec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="rect206"
-         width="26.295755"
-         height="102.36562"
-         x="1066.8611"
-         y="418.66275" />
-      <text
-         id="text210"
-         y="1084.9105"
-         x="421.51923"
-         style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           y="1084.9105"
-           x="421.51923"
-           id="tspan208"
-           sodipodi:role="line"
-           style="font-size:13.1479px;line-height:1.25">Repoclosure</tspan></text>
-    </g>
    <rect
       y="377.92242"
-       x="1096.0963"
+       x="1122.3463"
       height="224.24059"
       width="26.295755"
       id="rect87"
@ -489,17 +472,18 @@
       xml:space="preserve"
       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
       x="380.7789"
-       y="1114.1458"
+       y="1140.3958"
       id="text91"><tspan
         style="font-size:13.1479px;line-height:1.25"
         sodipodi:role="line"
         id="tspan89"
         x="380.7789"
-         y="1114.1458">Repoclosure</tspan></text>
+         y="1140.3958">Repoclosure</tspan></text>
    <g
-       id="g206">
+       id="g206"
+       transform="translate(0,-1.8749994)">
      <rect
-         style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1.00033px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="fill:#fcd9a4;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00033px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
         id="rect290-6"
         width="26.295755"
         height="101.91849"
@ -516,26 +500,58 @@
           x="380.23166"
           sodipodi:role="line"
           id="tspan301-5"
+           style="font-size:12px;line-height:0">KiwiBuild</tspan></text>
+    </g>
+    <g
+       id="g3">
+      <g
+         id="g1">
+        <g
+           id="g4">
+          <rect
+             transform="matrix(0,1,1,0,0,0)"
+             style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1.83502px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             id="rect3338-1-3"
+             width="103.12497"
+             height="115.80065"
+             x="983.44263"
+             y="486.55563" />
+          <text
+             id="text3384-0-6"
+             y="1038.8422"
+             x="489.56451"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             xml:space="preserve"><tspan
+               style="font-size:13.1475px;line-height:1.25"
+               id="tspan3391-7"
+               sodipodi:role="line"
+               x="489.56451"
+               y="1038.8422">ImageContainer</tspan></text>
+        </g>
+      </g>
+    </g>
+    <g
+       id="g206-1"
+       transform="translate(-0.04628921,28.701853)">
+      <rect
+         style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1.00033px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="rect290-6-7"
+         width="26.295755"
+         height="101.91849"
+         x="1032.3469"
+         y="377.92731"
+         transform="matrix(0,1,1,0,0,0)" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="380.23166"
+         y="1049.1219"
+         id="text294-7-5"><tspan
+           y="1049.1219"
+           x="380.23166"
+           sodipodi:role="line"
+           id="tspan301-5-5"
           style="font-size:12px;line-height:0">OSBuild</tspan></text>
    </g>
-    <rect
-       transform="matrix(0,1,1,0,0,0)"
-       style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1.83502px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect3338-1-3"
-       width="88.544876"
-       height="115.80065"
-       x="970.31763"
-       y="486.55563" />
-    <text
-       id="text3384-0-6"
-       y="1018.2172"
-       x="489.56451"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         style="font-size:13.1475px;line-height:1.25"
-         id="tspan3391-7"
-         sodipodi:role="line"
-         x="489.56451"
-         y="1018.2172">ImageContainer</tspan></text>
  </g>
 </svg>
--- a/doc/conf.py
+++ b/doc/conf.py
@ -18,12 +18,12 @@ import os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+# sys.path.insert(0, os.path.abspath('.'))

 # -- General configuration ------------------------------------------------

 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'

 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
@ -31,207 +31,201 @@ import os
 extensions = []

 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]

 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = ".rst"

 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'

 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"

 # General information about the project.
-project = u'Pungi'
-copyright = u'2016, Red Hat, Inc.'
+project = "Pungi"
+copyright = "2016, Red Hat, Inc."

 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '4.3'
+version = "4.7"
 # The full version, including alpha/beta/rc tags.
-release = '4.3.6'
+release = "4.7.0"

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-#language = None
+# language = None

 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'

 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ["_build"]

 # The reST default role (used for this markup: `text`) to use for all
 # documents.
-#default_role = None
+# default_role = None

 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True

 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True

 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False

 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"

 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []

 # If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
+# keep_warnings = False


 # -- Options for HTML output ----------------------------------------------

 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = "default"

 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+# html_theme_options = {}

 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# html_theme_path = []

 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+# html_title = None

 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None

 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+# html_logo = None

 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+# html_favicon = None

 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]

 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-#html_extra_path = []
+# html_extra_path = []

 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# html_last_updated_fmt = '%b %d, %Y'

 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True

 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}

 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}

 # If false, no module index is generated.
-#html_domain_indices = True
+# html_domain_indices = True

 # If false, no index is generated.
-#html_use_index = True
+# html_use_index = True

 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False

 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True

 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True

 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True

 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''

 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None

 # Output file base name for HTML help builder.
-htmlhelp_basename = 'Pungidoc'
+htmlhelp_basename = "Pungidoc"


 # -- Options for LaTeX output ---------------------------------------------

 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
 }

 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('index', 'Pungi.tex', u'Pungi Documentation',
-   u'Daniel Mach', 'manual'),
+    ("index", "Pungi.tex", "Pungi Documentation", "Daniel Mach", "manual"),
 ]

 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None

 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False

 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False

 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False

 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []

 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True


 # -- Options for manual page output ---------------------------------------

 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'pungi', u'Pungi Documentation',
-     [u'Daniel Mach'], 1)
-]
+man_pages = [("index", "pungi", "Pungi Documentation", ["Daniel Mach"], 1)]

 # If true, show URL addresses after external links.
-#man_show_urls = False
+# man_show_urls = False


 # -- Options for Texinfo output -------------------------------------------
@ -240,19 +234,25 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'Pungi', u'Pungi Documentation',
-   u'Daniel Mach', 'Pungi', 'One line description of project.',
-   'Miscellaneous'),
+    (
+        "index",
+        "Pungi",
+        "Pungi Documentation",
+        "Daniel Mach",
+        "Pungi",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]

 # Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
+# texinfo_appendices = []

 # If false, no module index is generated.
-#texinfo_domain_indices = True
+# texinfo_domain_indices = True

 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
+# texinfo_show_urls = 'footnote'

 # If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
+# texinfo_no_detailmenu = False
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@ -194,6 +194,17 @@ Options
    Tracking Service Kerberos authentication. If not defined, the default
    Kerberos principal is used.

+**cts_oidc_token_url**
+    (*str*) -- URL to the OIDC token endpoint.
+    For example ``https://oidc.example.com/openid-connect/token``.
+    This option can be overridden by the environment variable ``CTS_OIDC_TOKEN_URL``.
+
+**cts_oidc_client_id*
+    (*str*) -- OIDC client ID.
+    This option can be overridden by the environment variable ``CTS_OIDC_CLIENT_ID``.
+    Note that environment variable ``CTS_OIDC_CLIENT_SECRET`` must be configured with
+    corresponding client secret to authenticate to CTS via OIDC.
+
 **compose_type**
    (*str*) -- Allows to set default compose type. Type set via a command-line
    option overwrites this.
@ -281,8 +292,8 @@ There a couple common format specifiers available for both the options:
    format string. The pattern should not overlap, otherwise it is undefined
    which one will be used.

-    This format will be used for all phases generating images. Currently that
-    means ``createiso``, ``live_images`` and ``buildinstall``.
+    This format will be used for some phases generating images. Currently that
+    means ``createiso``, ``buildinstall`` and ``ostree_installer``.

    Available extra keys are:
     * ``disc_num``
@ -312,7 +323,6 @@ There a couple common format specifiers available for both the options:

    Available keys are:
     * ``boot`` -- for ``boot.iso`` images created in  *buildinstall* phase
-     * ``live`` -- for images created by *live_images* phase
     * ``dvd`` -- for images created by *createiso* phase
     * ``ostree`` -- for ostree installer images

@ -340,48 +350,10 @@ Example

    disc_types = {
        'boot': 'netinst',
-        'live': 'Live',
        'dvd': 'DVD',
    }


-Signing
-=======
-
-If you want to sign deliverables generated during pungi run like RPM wrapped
-images. You must provide few configuration options:
-
-**signing_command** [optional]
-    (*str*) -- Command that will be run with a koji build as a single
-    argument. This command must not require any user interaction.
-    If you need to pass a password for a signing key to the command,
-    do this via command line option of the command and use string
-    formatting syntax ``%(signing_key_password)s``.
-    (See **signing_key_password_file**).
-
-**signing_key_id** [optional]
-    (*str*) -- ID of the key that will be used for the signing.
-    This ID will be used when crafting koji paths to signed files
-    (``kojipkgs.fedoraproject.org/packages/NAME/VER/REL/data/signed/KEYID/..``).
-
-**signing_key_password_file** [optional]
-    (*str*) -- Path to a file with password that will be formatted
-    into **signing_command** string via ``%(signing_key_password)s``
-    string format syntax (if used).
-    Because pungi config is usually stored in git and is part of compose
-    logs we don't want password to be included directly in the config.
-    Note: If ``-`` string is used instead of a filename, then you will be asked
-    for the password interactivelly right after pungi starts.
-
-Example
-------
-::
-
-        signing_command = '~/git/releng/scripts/sigulsign_unsigned.py -vv --password=%(signing_key_password)s fedora-24'
-        signing_key_id = '81b46521'
-        signing_key_password_file = '~/password_for_fedora-24_key'
-
-
 .. _git-urls:

 Git URLs
@ -581,6 +553,16 @@ Options
    with everything. Set this option to ``False`` to ignore ``noarch`` in
    ``ExclusiveArch`` and always consider only binary architectures.

+**pkgset_inherit_exclusive_arch_to_noarch** = True
+    (*bool*) -- When set to ``True``, the value of ``ExclusiveArch`` or
+    ``ExcludeArch`` will be copied from source rpm to all its noarch packages.
+    That will than limit which architectures the noarch packages can be
+    included in.
+
+    By setting this option to ``False`` this step is skipped, and noarch
+    packages will by default land in all architectures. They can still be
+    excluded by listing them in a relevant section of ``filter_packages``.
+
 **pkgset_allow_reuse** = True
    (*bool*) -- When set to ``True``, *Pungi* will try to reuse pkgset data
    from the old composes specified by ``--old-composes``. When enabled, this
@ -621,7 +603,7 @@ Options
 -------

 **buildinstall_method**
-    (*str*) -- "lorax" (f16+, rhel7+) or "buildinstall" (older releases)
+    (*str*) -- "lorax" (f16+, rhel7+)
 **lorax_options**
    (*list*) -- special options passed on to *lorax*.

@ -920,6 +902,10 @@ Options
    comps file can not be found in the package set. When disabled (the
    default), such cases are still reported as warnings in the log.

+    With ``dnf`` gather backend, this option will abort the compose on any
+    missing package no matter if it's listed in comps, ``additional_packages``
+    or prepopulate file.
+
 **gather_source_mapping**
    (*str*) -- JSON mapping with initial packages for the compose. The value
    should be a path to JSON file with following mapping: ``{variant: {arch:
@ -1343,8 +1329,8 @@ All non-``RC`` milestones from label get appended to the version. For release
 either label is used or date, type and respin.


-Common options for Live Images, Live Media and Image Build
-==========================================================
+Common options for Live Media and Image Build
+=============================================

 All images can have ``ksurl``, ``version``, ``release`` and ``target``
 specified. Since this can create a lot of duplication, there are global options
@ -1360,14 +1346,12 @@ The kickstart URL is configured by these options.
 * ``global_ksurl`` -- global fallback setting
 * ``live_media_ksurl``
 * ``image_build_ksurl``
- * ``live_images_ksurl``

 Target is specified by these settings.

 * ``global_target`` -- global fallback setting
 * ``live_media_target``
 * ``image_build_target``
- * ``live_images_target``
 * ``osbuild_target``

 Version is specified by these options. If no version is set, a default value
@ -1376,7 +1360,6 @@ will be provided according to :ref:`automatic versioning <auto-version>`.
 * ``global_version`` -- global fallback setting
 * ``live_media_version``
 * ``image_build_version``
- * ``live_images_version``
 * ``osbuild_version``

 Release is specified by these options. If set to a magic value to
@ -1386,44 +1369,14 @@ to :ref:`automatic versioning <auto-version>`.
 * ``global_release`` -- global fallback setting
 * ``live_media_release``
 * ``image_build_release``
- * ``live_images_release``
 * ``osbuild_release``

-Each configuration block can also optionally specify a ``failable`` key. For
-live images it should have a boolean value. For live media and image build it
+Each configuration block can also optionally specify a ``failable`` key. It
 should be a list of strings containing architectures that are optional. If any
 deliverable fails on an optional architecture, it will not abort the whole
 compose. If the list contains only ``"*"``, all arches will be substituted.


-Live Images Settings
-====================
-
-**live_images**
-    (*list*) -- Configuration for the particular image. The elements of the
-    list should be tuples ``(variant_uid_regex, {arch|*: config})``. The config
-    should be a dict with these keys:
-
-      * ``kickstart`` (*str*)
-      * ``ksurl`` (*str*) [optional] -- where to get the kickstart from
-      * ``name`` (*str*)
-      * ``version`` (*str*)
-      * ``target`` (*str*)
-      * ``repo`` (*str|[str]*) -- repos specified by URL or variant UID
-      * ``specfile`` (*str*) -- for images wrapped in RPM
-      * ``scratch`` (*bool*) -- only RPM-wrapped images can use scratch builds,
-        but by default this is turned off
-      * ``type`` (*str*) -- what kind of task to start in Koji. Defaults to
-        ``live`` meaning ``koji spin-livecd`` will be used. Alternative option
-        is ``appliance`` corresponding to ``koji spin-appliance``.
-      * ``sign`` (*bool*) -- only RPM-wrapped images can be signed
-
-**live_images_no_rename**
-    (*bool*) -- When set to ``True``, filenames generated by Koji will be used.
-    When ``False``, filenames will be generated based on ``image_name_format``
-    configuration option.
-
-
 Live Media Settings
 ===================

@ -1579,6 +1532,61 @@ Example
    }


+KiwiBuild Settings
+==================
+
+**kiwibuild**
+    (*dict*) -- configuration for building images using kiwi by a Koji plugin.
+    Pungi will trigger a Koji task delegating to kiwi, which will build the image,
+    import it to Koji via content generators.
+
+    Format: ``{variant_uid_regex: [{...}]}``.
+
+    Required keys in the configuration dict:
+
+    * ``kiwi_profile`` -- (*str*) select profile from description file.
+
+    Description scm, description path and target have to be provided too, but
+    instead of specifying them for each image separately, you can use the
+    ``kiwibuild_*`` options or ``global_target``.
+
+    Optional keys:
+
+    * ``description_scm`` -- (*str*) scm URL of description kiwi description.
+    * ``description_path`` -- (*str*) path to kiwi description inside the scm
+      repo.
+    * ``repos`` -- additional repos used to install RPMs in the image. The
+      compose repository for the enclosing variant is added automatically.
+      Either variant name or a URL is supported.
+    * ``target`` -- (*str*) which build target to use for the task. If not
+      provided, then either ``kiwibuild_target`` or ``global_target`` is
+      needed.
+    * ``release`` -- (*str*) release of the output image.
+    * ``arches`` -- (*[str]*) List of architectures to build for. If not
+      provided, all variant architectures will be built.
+    * ``failable`` -- (*[str]*) List of architectures for which this
+      deliverable is not release blocking.
+    * ``type`` -- (*str*) override default type from the bundle with this value.
+    * ``type_attr`` -- (*[str]*) override default attributes for the build type
+      from description.
+    * ``bundle_name_format`` -- (*str*) override default bundle format name.
+
+**kiwibuild_description_scm**
+    (*str*) -- URL for scm containing the description files
+
+**kiwibuild_description_path**
+    (*str*) -- path to a description file within the description scm
+
+**kiwibuild_type**
+    (*str*) -- override default type from the bundle with this value.
+
+**kiwibuild_type_attr**
+    (*[str]*) -- override default attributes for the build type from description.
+
+**kiwibuild_bundle_name_format**
+    (*str*) -- override default bundle format name.
+
+
 OSBuild Composer for building images
 ====================================

@ -1607,16 +1615,37 @@ OSBuild Composer for building images
    * ``release`` -- release part of the final NVR. If neither this option nor
      the global ``osbuild_release`` is set, Koji will automatically generate a
      value.
-    * ``repo`` -- a list of repository URLs from which to consume packages for
+    * ``repo`` -- a list of repositories from which to consume packages for
      building the image. By default only the variant repository is used.
+      The list items may use one of the following formats:
+
+      * String with just the repository URL.
+
+      * Dictionary with the following keys:
+
+        * ``baseurl`` -- URL of the repository.
+        * ``package_sets`` -- a list of package set names to use for this
+            repository. Package sets are an internal concept of Image Builder
+            and are used in image definitions. If specified, the repository is
+            used by Image Builder only for the pipeline with the same name.
+            For example, specifying the ``build`` package set name will make
+            the repository to be used only for the build environment in which
+            the image will be built. (optional)
+
    * ``arches`` -- list of architectures for which to build the image. By
      default, the variant arches are used. This option can only restrict it,
      not add a new one.
+    * ``manifest_type`` -- the image type that is put into the manifest by
+      pungi. If not supplied then it is autodetected from the Koji output.
    * ``ostree_url`` -- URL of the repository that's used to fetch the parent
      commit from.
    * ``ostree_ref`` -- name of the ostree branch
    * ``ostree_parent`` -- commit hash or a a branch-like reference to the
      parent commit.
+    * ``customizations`` -- a dictionary with customizations to use for the
+      image build. For the list of supported customizations, see the **hosted**
+      variants in the `Image Builder documentation
+      <https://osbuild.org/docs/user-guide/blueprint-reference#installation-device>`.
    * ``upload_options`` -- a dictionary with upload options specific to the
      target cloud environment. If provided, the image will be uploaded to the
      cloud environment, in addition to the Koji server. One can't combine
@ -1641,13 +1670,13 @@ OSBuild Composer for building images
        * ``tenant_id`` -- Azure tenant ID to upload the image to
        * ``subscription_id`` -- Azure subscription ID to upload the image to
        * ``resource_group`` -- Azure resource group to upload the image to
-        * ``location`` -- Azure location to upload the image to
+        * ``location`` -- Azure location of the resource group (optional)
        * ``image_name`` -- Image name of the uploaded Azure image (optional)

      * **GCP upload options** -- upload to Google Cloud Platform.

        * ``region`` -- GCP region to upload the image to
-        * ``bucket`` -- GCP bucket to upload the image to
+        * ``bucket`` -- GCP bucket to upload the image to (optional)
        * ``share_with_accounts`` -- list of GCP accounts to share the image
          with
        * ``image_name`` -- Image name of the uploaded GCP image (optional)
@ -1724,16 +1753,16 @@ another directory. Any new packages in the compose will be added to the
 repository with a new commit.

 **ostree**
-    (*dict*) -- a mapping of configuration for each. The format should be
-    ``{variant_uid_regex: config_dict}``. It is possible to use a list of
+    (*dict*) -- a mapping of configuration for each variant. The format should
+    be ``{variant_uid_regex: config_dict}``. It is possible to use a list of
    configuration dicts as well.

    The configuration dict for each variant arch pair must have these keys:

    * ``treefile`` -- (*str*) Filename of configuration for ``rpm-ostree``.
    * ``config_url`` -- (*str*) URL for Git repository with the ``treefile``.
-    * ``repo`` -- (*str|dict|[str|dict]*) repos specified by URL or variant UID
-      or a dict of repo options, ``baseurl`` is required in the dict.
+    * ``repo`` -- (*str|dict|[str|dict]*) repos specified by URL or a dict of
+      repo options, ``baseurl`` is required in the dict.
    * ``ostree_repo`` -- (*str*) Where to put the ostree repository

    These keys are optional:
@ -1764,6 +1793,8 @@ repository with a new commit.
    * ``tag_ref`` -- (*bool*, default ``True``) If set to ``False``, a git
      reference will not be created.
    * ``ostree_ref`` -- (*str*) To override value ``ref`` from ``treefile``.
+    * ``runroot_packages`` -- (*list*) A list of additional package names to be
+      installed in the runroot environment in Koji.

 Example config
 --------------
@ -1773,13 +1804,11 @@ Example config
        "^Atomic$": {
            "treefile": "fedora-atomic-docker-host.json",
            "config_url": "https://git.fedorahosted.org/git/fedora-atomic.git",
+            "keep_original_sources": True,
            "repo": [
-                "Server",
                "http://example.com/repo/x86_64/os",
-                {"baseurl": "Everything"},
                {"baseurl": "http://example.com/linux/repo", "exclude": "systemd-container"},
            ],
-            "keep_original_sources": True,
            "ostree_repo": "/mnt/koji/compose/atomic/Rawhide/",
            "update_summary": True,
            # Automatically generate a reasonable version
@ -1795,6 +1824,79 @@ Example config
    has the pungi_ostree plugin installed.


+OSTree Native Container Settings
+================================
+
+The ``ostree_container`` phase of *Pungi* can create an ostree native container
+image as an OCI archive. This is done by running ``rpm-ostree compose image``
+in a Koji runroot environment.
+
+While rpm-ostree can use information from previously built images to improve
+the split in container layers, we can not use that functionnality until
+https://github.com/containers/skopeo/pull/2114 is resolved. Each invocation
+will thus create a new OCI archive image *from scratch*.
+
+**ostree_container**
+    (*dict*) -- a mapping of configuration for each variant. The format should
+    be ``{variant_uid_regex: config_dict}``. It is possible to use a list of
+    configuration dicts as well.
+
+    The configuration dict for each variant arch pair must have these keys:
+
+    * ``treefile`` -- (*str*) Filename of configuration for ``rpm-ostree``.
+    * ``config_url`` -- (*str*) URL for Git repository with the ``treefile``.
+
+    These keys are optional:
+
+    * ``repo`` -- (*str|dict|[str|dict]*) repos specified by URL or a dict of
+      repo options, ``baseurl`` is required in the dict.
+    * ``keep_original_sources`` -- (*bool*) Keep the existing source repos in
+      the tree config file. If not enabled, all the original source repos will
+      be removed from the tree config file.
+    * ``config_branch`` -- (*str*) Git branch of the repo to use. Defaults to
+      ``main``.
+    * ``arches`` -- (*[str]*) List of architectures for which to generate
+      ostree native container images. There will be one task per architecture.
+      By default all architectures in the variant are used.
+    * ``failable`` -- (*[str]*) List of architectures for which this
+      deliverable is not release blocking.
+    * ``version`` -- (*str*) Version string to be added to the OCI archive name.
+      If this option is set to ``!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN``,
+      a value will be generated automatically as ``$VERSION.$RELEASE``.
+      If this option is set to ``!VERSION_FROM_VERSION_DATE_RESPIN``,
+      a value will be generated automatically as ``$VERSION.$DATE.$RESPIN``.
+      :ref:`See how those values are created <auto-version>`.
+    * ``tag_ref`` -- (*bool*, default ``True``) If set to ``False``, a git
+      reference will not be created.
+    * ``runroot_packages`` -- (*list*) A list of additional package names to be
+      installed in the runroot environment in Koji.
+
+Example config
+--------------
+::
+
+    ostree_container = {
+        "^Sagano$": {
+            "treefile": "fedora-tier-0-38.yaml",
+            "config_url": "https://gitlab.com/CentOS/cloud/sagano.git",
+            "config_branch": "main",
+            "repo": [
+                "http://example.com/repo/x86_64/os",
+                {"baseurl": "http://example.com/linux/repo", "exclude": "systemd-container"},
+            ],
+            # Automatically generate a reasonable version
+            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+            # Only run this for x86_64 even if Sagano has more arches
+            "arches": ["x86_64"],
+        }
+    }
+
+**ostree_container_use_koji_plugin** = False
+    (*bool*) -- When set to ``True``, the Koji pungi_ostree task will be
+    used to execute rpm-ostree instead of runroot. Use only if the Koji instance
+    has the pungi_ostree plugin installed.
+
+
 Ostree Installer Settings
 =========================

@ -2145,9 +2247,9 @@ Miscellaneous Settings
    format string accepting ``%(variant_name)s`` and ``%(arch)s`` placeholders.

 **symlink_isos_to**
-    (*str*) -- If set, the ISO files from ``buildinstall``, ``createiso`` and
-    ``live_images`` phases will be put into this destination, and a symlink
-    pointing to this location will be created in actual compose directory.
+    (*str*) -- If set, the ISO files from ``buildinstall`` and ``createiso``
+    phases will be put into this destination, and a symlink pointing to this
+    location will be created in actual compose directory.

 **dogpile_cache_backend**
    (*str*) -- If set, Pungi will use the configured Dogpile cache backend to
--- a/doc/examples.rst
+++ b/doc/examples.rst
@ -294,30 +294,6 @@ This is a shortened configuration for Fedora Radhide compose as of 2019-10-14.
        })
    ]

-    live_target = 'f32'
-    live_images_no_rename = True
-    live_images = [
-        ('^Workstation$', {
-            'armhfp': {
-                'kickstart': 'fedora-arm-workstation.ks',
-                'name': 'Fedora-Workstation-armhfp',
-                # Again workstation takes packages from Everything.
-                'repo': 'Everything',
-                'type': 'appliance',
-                'failable': True,
-            }
-        }),
-        ('^Server$', {
-            # But Server has its own repo.
-            'armhfp': {
-                'kickstart': 'fedora-arm-server.ks',
-                'name': 'Fedora-Server-armhfp',
-                'type': 'appliance',
-                'failable': True,
-            }
-        }),
-    ]
-
    ostree = {
        "^Silverblue$": {
            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
@ -343,6 +319,20 @@ This is a shortened configuration for Fedora Radhide compose as of 2019-10-14.
        }
    }

+    ostree_container = {
+        "^Sagano$": {
+            "treefile": "fedora-tier-0-38.yaml",
+            "config_url": "https://gitlab.com/CentOS/cloud/sagano.git",
+            "config_branch": "main",
+            # Consume packages from Everything
+            "repo": "Everything",
+            # Automatically generate a reasonable version
+            "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
+            # Only run this for x86_64 even if Sagano has more arches
+            "arches": ["x86_64"],
+        }
+    }
+
    ostree_installer = [
        ("^Silverblue$", {
            "x86_64": {
--- a/doc/index.rst
+++ b/doc/index.rst
@ -19,7 +19,7 @@ Contents:
    scm_support
    messaging
    gathering
+    koji
    comps
    contributing
    testing
-    multi_compose
--- a/doc/koji.rst
+++ b/doc/koji.rst
@ -0,0 +1,105 @@
+======================
+Getting data from koji
+======================
+
+When Pungi is configured to get packages from a Koji tag, it somehow needs to
+access the actual RPM files.
+
+Historically, this required the storage used by Koji to be directly available
+on the host where Pungi was running. This was usually achieved by using NFS for
+the Koji volume, and mounting it on the compose host.
+
+The compose could be created directly on the same volume. In such case the
+packages would be hardlinked, significantly reducing space consumption.
+
+The compose could also be created on a different storage, in which case the
+packages would either need to be copied over or symlinked. Using symlinks
+requires that anything that accesses the compose (e.g. a download server) would
+also need to mount the Koji volume in the same location.
+
+There is also a risk with symlinks that the package in Koji can change (due to
+being resigned for example), which would invalidate composes linking to it.
+
+
+Using Koji without direct mount
+===============================
+
+It is possible now to run a compose from a Koji tag without direct access to
+Koji storage.
+
+Pungi can download the packages over HTTP protocol, store them in a local
+cache, and consume them from there.
+
+The local cache has similar structure to what is on the Koji volume.
+
+When Pungi needs some package, it has a path on Koji volume. It will replace
+the ``topdir`` with the cache location. If such file exists, it will be used.
+If it doesn't exist, it will be downloaded from Koji (by replacing the
+``topdir`` with ``topurl``).
+
+::
+
+    Koji path                            /mnt/koji/packages/foo/1/1.fc38/data/signed/abcdef/noarch/foo-1-1.fc38.noarch.rpm
+    Koji URL    https://kojipkgs.fedoraproject.org/packages/foo/1/1.fc38/data/signed/abcdef/noarch/foo-1-1.fc38.noarch.rpm
+    Local path                  /mnt/compose/cache/packages/foo/1/1.fc38/data/signed/abcdef/noarch/foo-1-1.fc38.noarch.rpm
+
+The packages can be hardlinked from this cache directory.
+
+
+Cleanup
+-------
+
+While the approach above allows each RPM to be downloaded only once, it will
+eventually result in the Koji volume being mirrored locally. Most of the
+packages will however no longer be needed.
+
+There is a script ``pungi-cache-cleanup`` that can help with that. It can find
+and remove files from the cache that are no longer needed.
+
+A file is no longer needed if it has a single link (meaning it is only in the
+cache, not in any compose), and it has mtime older than a given threshold.
+
+It doesn't make sense to delete files that are hardlinked in an existing
+compose as it would not save any space anyway.
+
+The mtime check is meant to preserve files that are downloaded but not actually
+used in a compose, like a subpackage that is not included in any variant. Every
+time its existence in the local cache is checked, the mtime is updated.
+
+
+Race conditions?
+----------------
+
+It should be safe to have multiple compose hosts share the same storage volume
+for generated composes and local cache.
+
+If a cache file is accessed and it exists, there's no risk of race condition.
+
+If two composes need the same file at the same time and it is not present yet,
+one of them will take a lock on it and start downloading. The other will wait
+until the download is finished.
+
+The lock is only valid for a set amount of time (5 minutes) to avoid issues
+where the downloading process is killed in a way that blocks it from releasing
+the lock.
+
+If the file is large and network slow, the limit may not be enough finish
+downloading. In that case the second process will steal the lock while the
+first process is still downloading. This will result in the same file being
+downloaded twice.
+
+When the first process finishes the download, it will put the file into the
+local cache location. When the second process finishes, it will atomically
+replace it, but since it's the same file it will be the same file.
+
+If the first compose already managed to hardlink the file before it gets
+replaced, there will be two copies of the file present locally.
+
+
+Integrity checking
+------------------
+
+There is minimal integrity checking. RPM packages belonging to real builds will
+be check to match the checksum provided by Koji hub.
+
+There is no checking for scratch builds or any images.
--- a/doc/multi_compose.rst
+++ b/doc/multi_compose.rst
@ -1,107 +0,0 @@
-.. _multi_compose:
-
-Managing compose from multiple parts
-====================================
-
-There may be cases where it makes sense to split a big compose into separate
-parts, but create a compose output that links all output into one familiar
-structure.
-
-The `pungi-orchestrate` tools allows that.
-
-It works with an INI-style configuration file. The ``[general]`` section
-contains information about identity of the main compose. Other sections define
-individual parts.
-
-The parts are scheduled to run in parallel, with the minimal amount of
-serialization. The final compose directory will contain hard-links to the
-files.
-
-
-General settings
----------------
-
-**target**
-   Path to directory where the final compose should be created.
-**compose_type**
-   Type of compose to make.
-**release_name**
-   Name of the product for the final compose.
-**release_short**
-   Short name of the product for the final compose.
-**release_version**
-   Version of the product for the final compose.
-**release_type**
-   Type of the product for the final compose.
-**extra_args**
-   Additional arguments that will be passed to the child Pungi processes.
-**koji_profile**
-   If specified, a current event will be retrieved from the Koji instance and
-   used for all parts.
-
-**kerberos**
-   If set to yes, a kerberos ticket will be automatically created at the start.
-   Set keytab and principal as well.
-**kerberos_keytab**
-   Path to keytab file used to create the kerberos ticket.
-**kerberos_principal**
-   Kerberos principal for the ticket
-
-**pre_compose_script**
-   Commands to execute before first part is started. Can contain multiple
-   commands on separate lines.
-**post_compose_script**
-   Commands to execute after the last part finishes and final status is
-   updated. Can contain multiple commands on separate lines. ::
-
-      post_compose_script =
-          compose-latest-symlink $COMPOSE_PATH
-          custom-post-compose-script.sh
-
-   Multiple environment variables are defined for the scripts:
-
-    * ``COMPOSE_PATH``
-    * ``COMPOSE_ID``
-    * ``COMPOSE_DATE``
-    * ``COMPOSE_TYPE``
-    * ``COMPOSE_RESPIN``
-    * ``COMPOSE_LABEL``
-    * ``RELEASE_ID``
-    * ``RELEASE_NAME``
-    * ``RELEASE_SHORT``
-    * ``RELEASE_VERSION``
-    * ``RELEASE_TYPE``
-    * ``RELEASE_IS_LAYERED`` – ``YES`` for layered products, empty otherwise
-    * ``BASE_PRODUCT_NAME`` – only set for layered products
-    * ``BASE_PRODUCT_SHORT`` – only set for layered products
-    * ``BASE_PRODUCT_VERSION`` – only set for layered products
-    * ``BASE_PRODUCT_TYPE`` – only set for layered products
-
-**notification_script**
-   Executable name (or path to a script) that will be used to send a message
-   once the compose is finished. In order for a valid URL to be included in the
-   message, at least one part must configure path translation that would apply
-   to location of main compose.
-
-   Only two messages will be sent, one for start and one for finish (either
-   successful or not).
-
-
-Partial compose settings
------------------------
-
-Each part should have a separate section in the config file.
-
-It can specify these options:
-
-**config**
-   Path to configuration file that describes this part. If relative, it is
-   resolved relative to the file with parts configuration.
-**just_phase**, **skip_phase**
-   Customize which phases should run for this part.
-**depends_on**
-   A comma separated list of other parts that must be finished before this part
-   starts.
-**failable**
-   A boolean toggle to mark a part as failable. A failure in such part will
-   mark the final compose as incomplete, but still successful.
--- a/doc/phases.rst
+++ b/doc/phases.rst
@ -30,17 +30,14 @@ packages to architectures.
 Buildinstall
 ------------

-Spawns a bunch of threads, each of which runs either ``lorax`` or
-``buildinstall`` command (the latter coming from ``anaconda`` package). The
+Spawns a bunch of threads, each of which runs the ``lorax`` command. The
 commands create ``boot.iso`` and other boot configuration files. The image is
 finally linked into the ``compose/`` directory as netinstall media.

 The created images are also needed for creating live media or other images in
 later phases.

-With ``lorax`` this phase runs one task per variant.arch combination. For
-``buildinstall`` command there is only one task per architecture and
-``product.img`` should be used to customize the results.
+With ``lorax`` this phase runs one task per variant.arch combination.

 Gather
 ------
@ -115,6 +112,12 @@ ImageBuild
 This phase wraps up ``koji image-build``. It also updates the metadata
 ultimately responsible for ``images.json`` manifest.

+KiwiBuild
+---------
+
+Similarly to image build, this phases creates a koji `kiwiBuild` task. In the
+background it uses Kiwi to create images.
+
 OSBuild
 -------

--- a/doc/scm_support.rst
+++ b/doc/scm_support.rst
@ -41,6 +41,14 @@ which can contain following keys.
 * ``command`` -- defines a shell command to run after Git clone to generate the
  needed file (for example to run ``make``). Only supported in Git backend.

+* ``options`` -- a dictionary of additional configuration options. These are
+  specific to different backends.
+
+  Currently supported values for Git:
+
+  * ``credential_helper`` -- path to a credential helper used to supply
+    username/password for remotes that require authentication.
+

 Koji examples
 -------------
--- a/pungi.spec
+++ b/pungi.spec
@ -1,5 +1,5 @@
 Name:           pungi
-Version:        4.3.6
+Version:        4.7.0
 Release:        1%{?dist}
 Summary:        Distribution compose tool

@ -71,11 +71,11 @@ notification to Fedora Message Bus.
 %setup -q

 %build
-%{__python} setup.py build
+%{__python3} setup.py build

 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
 %{__install} -d %{buildroot}/var/cache/pungi
 %{__install} -d %{buildroot}/%{_mandir}/man8

@ -83,8 +83,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %license COPYING GPL
 %doc AUTHORS
-%{python_sitelib}/%{name}
-%{python_sitelib}/%{name}-%{version}-py?.?.egg-info
+%{python3_sitelib}/%{name}
+%{python3_sitelib}/%{name}-%{version}-py?.?.egg-info
 %{_bindir}/%{name}
 %{_bindir}/%{name}-koji
 %{_bindir}/%{name}-gather
@ -94,13 +94,12 @@ rm -rf %{buildroot}
 %dir %attr(1777, root, root) /var/cache/%{name}

 %files utils
-%{python_sitelib}/%{name}_utils
+%{python3_sitelib}/%{name}_utils
 %{_bindir}/%{name}-create-unified-isos
 %{_bindir}/%{name}-config-dump
 %{_bindir}/%{name}-config-validate
 %{_bindir}/%{name}-fedmsg-notification
 %{_bindir}/%{name}-notification-report-progress
-%{_bindir}/%{name}-orchestrate
 %{_bindir}/%{name}-patch-iso
 %{_bindir}/%{name}-compare-depsolving
 %{_bindir}/%{name}-wait-for-signed-ostree-handler
@ -111,6 +110,155 @@ pytest
 cd tests && ./test_compose.sh

 %changelog
+* Fri Aug 16 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.7.0-1
+- kiwibuild: Add support for type, type attr and bundle format (lsedlar)
+- createiso: Block reuse if unsigned packages are allowed (lsedlar)
+- Allow live_images phase to still be skipped (lsedlar)
+- createiso: Recompute .treeinfo checksums for images (lsedlar)
+- Drop support for signing rpm-wrapped artifacts (lsedlar)
+- Remove live_images.py (LiveImagesPhase) (awilliam)
+- Clean up requirements (lsedlar)
+- Update pungi.spec for py3 (hlin)
+
+* Fri Jul 12 2024 Haibo Lin <hlin@redhat.com> - 4.6.3-1
+- Fix formatting of long line (lsedlar)
+- unified-isos: Resolve symlinks (lsedlar)
+- gather: Skip lookaside packages from local lookaside repo (lsedlar)
+- pkgset: Avoid adding modules to unavailable arches (hlin)
+- iso: Extract volume id with xorriso if available (lsedlar)
+- De-duplicate log messages for ostree and ostree_container phases (awilliam)
+- Handle tracebacks as str or bytes (lsedlar)
+- ostree/container: add missing --version arg (awilliam)
+- Block pkgset reuse on module defaults change (lsedlar)
+- Include task ID in DONE message for OSBS phase (awilliam)
+- Various phases: consistent format of failure message (awilliam)
+- Update tests to exercise kiwi specific metadata (lsedlar)
+- Kiwi: translate virtualbox and azure productmd formats (awilliam)
+- kiwibuild: Add tests for the basic functionality (lsedlar)
+- kiwibuild: Remove repos as dicts (lsedlar)
+- Fix additional image metadata (lsedlar)
+- Drop kiwibuild_version option (lsedlar)
+- Update docs with kiwibuild options (lsedlar)
+- kiwibuild: allow setting description scm and path at phase level (awilliam)
+- Use latest Fedora for python 3 test environment (lsedlar)
+- Install unittest2 only on python 2 (lsedlar)
+- Fix 'failable' handling for kiwibuild phase (awilliam)
+- image_build: Accept Kiwi extension for Azure VHD images (jeremycline)
+- image_build: accept Kiwi vagrant image name format (awilliam)
+
+* Tue Mar 05 2024 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.2-1
+- Phases/osbuild: support passing 'customizations' for image builds (thozza)
+- dnf: Load filelists for actual solver too (lsedlar)
+- kiwibuild: Tell Koji which arches are allowed to fail (lsedlar)
+- kiwibuild: Update documentation with more details (lsedlar)
+- kiwibuild: Add kiwibuild global options (lsedlar)
+- kiwibuild: Process images same as image-build (lsedlar)
+- kiwibuild: Add subvariant configuration (lsedlar)
+- kiwibuild: Work around missing arch in build data (lsedlar)
+- Support KiwiBuild (hlin)
+- ostree/container: Set version in treefile 'automatic-version-prefix' (tim)
+- dnf: Explicitly load filelists (lsedlar)
+- Fix buildinstall reuse with pungi_buildinstall plugin (lsedlar)
+- Fix filters for DNF query (lsedlar)
+- gather-dnf: Support dotarch in filter_packages (lsedlar)
+- gather: Support dotarch notation for debuginfo packages (lsedlar)
+- Correctly set input and fultree_exclude flags for debuginfo (lsedlar)
+
+* Thu Feb  8 2024 Lubomír Sedlář <lsedlar>redhat.com> - 4.6.1-1
+- Make python3-mock dependency optional (lsedlar)
+- Make latest black happy (lsedlar)
+- Update tox configuration (lsedlar)
+- Fix scm tests to not use user configuration (lsedlar)
+- Add workaround for old requests in kojiwrapper (lsedlar)
+- Use pungi_buildinstall without NFS (lsedlar)
+- checks: don't require "repo" in the "ostree" schema (awilliam)
+- ostree_container: Use unique temporary directory (lsedlar)
+
+* Mon Dec 11 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.6.0-1
+- Add ostree container to image metadata (lsedlar)
+- Updates for ostree-container phase (lsedlar)
+- Add ostree native container support (tim)
+- Improve autodetection of productmd image type for osbuild images (awilliam)
+- pkgset: ignore events for modular content tags (lsedlar)
+- pkgset: Ignore duplicated module builds (lsedlar)
+- Drop buildinstall method (abisoi)
+- Add step to send UMB message (lzhuang)
+- Fix minor Ruff/flake8 warnings (tim)
+- osbuild: manifest type in config (cmdr)
+
+* Thu Sep  7 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.5.1-1
+- gather_dnf.py: Do not raise error when the downloaded package exists.
+  (ounsal)
+
+* Tue Aug 29 2023 Aditya Bisoi <abisoi@redhat.com> - 4.5.0-1
+- kojiwrapper: Stop being smart about local access (lsedlar)
+- Fix unittest errors (ounsal)
+- Add integrity checking for builds (lsedlar)
+- Add script for cleaning up the cache (lsedlar)
+- Add ability to download images (lsedlar)
+- Add support for not having koji volume mounted locally (lsedlar)
+- Remove repository cloning multiple times (abisoi)
+- Support require_all_comps_packages on DNF backend (lsedlar)
+- Fix new warnings from flake8 (lsedlar)
+
+* Tue Jul 25 2023 Aditya Bisoi <abisoi@redhat.com> - 4.4.1-1
+- ostree: Add configuration for custom runroot packages (lsedlar)
+- pkgset: Emit better error for missing modulemd file (lsedlar)
+- Add support for git-credential-helper (lsedlar)
+- Support OIDC Client Credentials authentication to CTS (hlin)
+
+* Tue Jun 06 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.4.0-1
+- gather-dnf: Run latest() later (lsedlar)
+- iso: Support joliet long names (lsedlar)
+- Drop pungi-orchestrator code (lsedlar)
+- isos: Ensure proper file ownership and permissions (lsedlar)
+- gather: Always get latest packages (lsedlar)
+- Add back compatibility with jsonschema <3.0.0 (lsedlar)
+- Remove useless debug message (lsedlar)
+- Remove fedmsg from requirements (lsedlar)
+- gather: Support dotarch in DNF backend (lsedlar)
+- Set the priority in the fedora-messaging notifier (aurelien)
+- Fix compatibility with createrepo_c 0.21.1 (lsedlar)
+- comps: Apply arch filtering to environment/optionlist (lsedlar)
+- Add config file for cleaning up cache files (hlin)
+
+* Tue Mar 28 2023 Haibo Lin <hlin@redhat.com> - 4.3.8-1
+- createiso: Update possibly changed file on DVD (lsedlar)
+- pkgset: Stop reuse if configuration changed (lsedlar)
+- Allow disabling inheriting ExcludeArch to noarch packages (lsedlar)
+- pkgset: Support extra builds with no tags (lsedlar)
+- buildinstall: Avoid pointlessly tweaking the boot images (lsedlar)
+- Prevent to reuse if unsigned packages are allowed (hlin)
+- Pass parent id/respin id to CTS (lsedlar)
+- Exclude existing files in boot.iso (hlin)
+- image-build/osbuild: Pull ISOs into the compose (lsedlar)
+- Retry 401 error from CTS (lsedlar)
+- gather: Better detection of debuginfo in lookaside (lsedlar)
+- Log versions of all installed packages (hlin)
+- Use authentication for all CTS calls (lsedlar)
+- Fix black complaints (lsedlar)
+- Add vhd.gz extension to compressed VHD images (lsedlar)
+- Add vhd-compressed image type (lsedlar)
+- Update to work with latest mock (lsedlar)
+- Default bztar format for sdist command (onosek)
+
+* Fri Dec 09 2022 Ondřej Nosek <onosek@redhat.com>
+- osbuild: test passing of rich repos from configuration (lsedlar)
+- osbuild: support specifying `package_sets` for repos (thozza)
+- osbuild: don't use `util.get_repo_urls()` (thozza)
+- osbuild: update schema and config documentation (thozza)
+- Speed up tests by 30 seconds (lsedlar)
+- Stop sending compose paths to CTS (lsedlar)
+- Report errors from CTS (lsedlar)
+- createiso: Create Joliet tree with xorriso (lsedlar)
+- init: Filter comps for modular variants with tags (lsedlar)
+- Retry failed cts requests (hlin)
+- Ignore existing kerberos ticket for CTS auth (lsedlar)
+- osbuild: support specifying upload_options (thozza)
+- osbuild: accept only a single image type in the configuration (thozza)
+- Add Jenkinsfile for CI (hlin)
+- profiler: Flush stdout before printing (lsedlar)
+
 * Fri Aug 26 2022 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.6-1
 - pkgset: Report better error when module is missing an arch (lsedlar)
 - osbuild: add support for building ostree artifacts (ondrej)
--- a/pungi/checks.py
+++ b/pungi/checks.py
@ -227,9 +227,19 @@ def validate(config, offline=False, schema=None):
    DefaultValidator = _extend_with_default_and_alias(
        jsonschema.Draft4Validator, offline=offline
    )
-    validator = DefaultValidator(
-        schema,
-    )
+
+    if hasattr(jsonschema.Draft4Validator, "TYPE_CHECKER"):
+        # jsonschema >= 3.0 has new interface for checking types
+        validator = DefaultValidator(schema)
+    else:
+        validator = DefaultValidator(
+            schema,
+            {
+                "array": (tuple, list),
+                "regex": six.string_types,
+                "url": six.string_types,
+            },
+        )
    errors = []
    warnings = []
    for error in validator.iter_errors(config):
@ -377,6 +387,7 @@ def _extend_with_default_and_alias(validator_class, offline=False):
                instance[property]["branch"] = resolver(
                    instance[property]["repo"],
                    instance[property].get("branch") or "HEAD",
+                    instance[property].get("options"),
                )

        for error in _hook_errors(properties, instance, schema):
@ -444,15 +455,18 @@ def _extend_with_default_and_alias(validator_class, offline=False):
                context=all_errors,
            )

-    def is_array(checker, instance):
-        return isinstance(instance, (tuple, list))
+    kwargs = {}
+    if hasattr(validator_class, "TYPE_CHECKER"):
+        # jsonschema >= 3
+        def is_array(checker, instance):
+            return isinstance(instance, (tuple, list))

-    def is_string_type(checker, instance):
-        return isinstance(instance, six.string_types)
+        def is_string_type(checker, instance):
+            return isinstance(instance, six.string_types)

-    type_checker = validator_class.TYPE_CHECKER.redefine_many(
-        {"array": is_array, "regex": is_string_type, "url": is_string_type}
-    )
+        kwargs["type_checker"] = validator_class.TYPE_CHECKER.redefine_many(
+            {"array": is_array, "regex": is_string_type, "url": is_string_type}
+        )

    return jsonschema.validators.extend(
        validator_class,
@ -464,7 +478,7 @@ def _extend_with_default_and_alias(validator_class, offline=False):
            "additionalProperties": _validate_additional_properties,
            "anyOf": _validate_any_of,
        },
-        type_checker=type_checker,
+        **kwargs
    )


@ -507,6 +521,13 @@ def make_schema():
                    "file": {"type": "string"},
                    "dir": {"type": "string"},
                    "command": {"type": "string"},
+                    "options": {
+                        "type": "object",
+                        "properties": {
+                            "credential_helper": {"type": "string"},
+                        },
+                        "additionalProperties": False,
+                    },
                },
                "additionalProperties": False,
            },
@ -532,27 +553,6 @@ def make_schema():
            "list_of_strings": {"type": "array", "items": {"type": "string"}},
            "strings": _one_or_list({"type": "string"}),
            "optional_string": {"anyOf": [{"type": "string"}, {"type": "null"}]},
-            "live_image_config": {
-                "type": "object",
-                "properties": {
-                    "kickstart": {"type": "string"},
-                    "ksurl": {"type": "url"},
-                    "name": {"type": "string"},
-                    "subvariant": {"type": "string"},
-                    "target": {"type": "string"},
-                    "version": {"type": "string"},
-                    "repo": {"$ref": "#/definitions/repos"},
-                    "specfile": {"type": "string"},
-                    "scratch": {"type": "boolean"},
-                    "type": {"type": "string"},
-                    "sign": {"type": "boolean"},
-                    "failable": {"type": "boolean"},
-                    "release": {"$ref": "#/definitions/optional_string"},
-                },
-                "required": ["kickstart"],
-                "additionalProperties": False,
-                "type": "object",
-            },
            "osbs_config": {
                "type": "object",
                "properties": {
@ -792,7 +792,7 @@ def make_schema():
            "buildinstall_allow_reuse": {"type": "boolean", "default": False},
            "buildinstall_method": {
                "type": "string",
-                "enum": ["lorax", "buildinstall"],
+                "enum": ["lorax"],
            },
            "buildinstall_topdir": {"type": "string"},
            "buildinstall_kickstart": {"$ref": "#/definitions/str_or_scm_dict"},
@ -811,8 +811,11 @@ def make_schema():
            "pdc_insecure": {"deprecated": "Koji is queried instead"},
            "cts_url": {"type": "string"},
            "cts_keytab": {"type": "string"},
+            "cts_oidc_token_url": {"type": "url"},
+            "cts_oidc_client_id": {"type": "string"},
            "koji_profile": {"type": "string"},
            "koji_event": {"type": "number"},
+            "koji_cache": {"type": "string"},
            "pkgset_koji_tag": {"$ref": "#/definitions/strings"},
            "pkgset_koji_builds": {"$ref": "#/definitions/strings"},
            "pkgset_koji_scratch_tasks": {"$ref": "#/definitions/strings"},
@ -830,6 +833,10 @@ def make_schema():
                "type": "boolean",
                "default": True,
            },
+            "pkgset_inherit_exclusive_arch_to_noarch": {
+                "type": "boolean",
+                "default": True,
+            },
            "pkgset_scratch_modules": {
                "type": "object",
                "patternProperties": {
@ -842,7 +849,10 @@ def make_schema():
            "paths_module": {"type": "string"},
            "skip_phases": {
                "type": "array",
-                "items": {"type": "string", "enum": PHASES_NAMES + ["productimg"]},
+                "items": {
+                    "type": "string",
+                    "enum": PHASES_NAMES + ["productimg", "live_images"],
+                },
                "default": [],
            },
            "image_name_format": {
@ -876,11 +886,6 @@ def make_schema():
            },
            "restricted_volid": {"type": "boolean", "default": False},
            "volume_id_substitutions": {"type": "object", "default": {}},
-            "live_images_no_rename": {"type": "boolean", "default": False},
-            "live_images_ksurl": {"type": "url"},
-            "live_images_target": {"type": "string"},
-            "live_images_release": {"$ref": "#/definitions/optional_string"},
-            "live_images_version": {"type": "string"},
            "image_build_ksurl": {"type": "url"},
            "image_build_target": {"type": "string"},
            "image_build_release": {"$ref": "#/definitions/optional_string"},
@ -913,8 +918,6 @@ def make_schema():
            "product_id": {"$ref": "#/definitions/str_or_scm_dict"},
            "product_id_allow_missing": {"type": "boolean", "default": False},
            "product_id_allow_name_prefix": {"type": "boolean", "default": True},
-            # Deprecated in favour of regular local/phase/global setting.
-            "live_target": {"type": "string"},
            "tree_arches": {"$ref": "#/definitions/list_of_strings", "default": []},
            "tree_variants": {"$ref": "#/definitions/list_of_strings", "default": []},
            "translate_paths": {"$ref": "#/definitions/string_pairs", "default": []},
@ -1032,11 +1035,13 @@ def make_schema():
                                        "config_branch": {"type": "string"},
                                        "tag_ref": {"type": "boolean"},
                                        "ostree_ref": {"type": "string"},
+                                        "runroot_packages": {
+                                            "$ref": "#/definitions/list_of_strings",
+                                        },
                                    },
                                    "required": [
                                        "treefile",
                                        "config_url",
-                                        "repo",
                                        "ostree_repo",
                                    ],
                                    "additionalProperties": False,
@ -1074,6 +1079,39 @@ def make_schema():
                    ),
                ]
            },
+            "ostree_container": {
+                "type": "object",
+                "patternProperties": {
+                    # Warning: this pattern is a variant uid regex, but the
+                    # format does not let us validate it as there is no regular
+                    # expression to describe all regular expressions.
+                    ".+": _one_or_list(
+                        {
+                            "type": "object",
+                            "properties": {
+                                "treefile": {"type": "string"},
+                                "config_url": {"type": "string"},
+                                "repo": {"$ref": "#/definitions/repos"},
+                                "keep_original_sources": {"type": "boolean"},
+                                "config_branch": {"type": "string"},
+                                "arches": {"$ref": "#/definitions/list_of_strings"},
+                                "failable": {"$ref": "#/definitions/list_of_strings"},
+                                "version": {"type": "string"},
+                                "tag_ref": {"type": "boolean"},
+                                "runroot_packages": {
+                                    "$ref": "#/definitions/list_of_strings",
+                                },
+                            },
+                            "required": [
+                                "treefile",
+                                "config_url",
+                            ],
+                            "additionalProperties": False,
+                        }
+                    ),
+                },
+                "additionalProperties": False,
+            },
            "ostree_installer": _variant_arch_mapping(
                {
                    "type": "object",
@ -1098,11 +1136,9 @@ def make_schema():
                }
            ),
            "ostree_use_koji_plugin": {"type": "boolean", "default": False},
+            "ostree_container_use_koji_plugin": {"type": "boolean", "default": False},
            "ostree_installer_use_koji_plugin": {"type": "boolean", "default": False},
            "ostree_installer_overwrite": {"type": "boolean", "default": False},
-            "live_images": _variant_arch_mapping(
-                _one_or_list({"$ref": "#/definitions/live_image_config"})
-            ),
            "image_build_allow_reuse": {"type": "boolean", "default": False},
            "image_build": {
                "type": "object",
@ -1153,6 +1189,50 @@ def make_schema():
                },
                "additionalProperties": False,
            },
+            "kiwibuild": {
+                "type": "object",
+                "patternProperties": {
+                    # Warning: this pattern is a variant uid regex, but the
+                    # format does not let us validate it as there is no regular
+                    # expression to describe all regular expressions.
+                    ".+": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "target": {"type": "string"},
+                                "description_scm": {"type": "url"},
+                                "description_path": {"type": "string"},
+                                "kiwi_profile": {"type": "string"},
+                                "release": {"type": "string"},
+                                "arches": {"$ref": "#/definitions/list_of_strings"},
+                                "repos": {"$ref": "#/definitions/list_of_strings"},
+                                "failable": {"$ref": "#/definitions/list_of_strings"},
+                                "subvariant": {"type": "string"},
+                                "type": {"type": "string"},
+                                "type_attr": {"$ref": "#/definitions/list_of_strings"},
+                                "bundle_name_format": {"type": "string"},
+                            },
+                            "required": [
+                                # description_scm and description_path
+                                # are really required, but as they can
+                                # be set at the phase level we cannot
+                                # enforce that here
+                                "kiwi_profile",
+                            ],
+                            "additionalProperties": False,
+                        },
+                    }
+                },
+                "additionalProperties": False,
+            },
+            "kiwibuild_description_scm": {"type": "url"},
+            "kiwibuild_description_path": {"type": "string"},
+            "kiwibuild_target": {"type": "string"},
+            "kiwibuild_release": {"$ref": "#/definitions/optional_string"},
+            "kiwibuild_type": {"type": "string"},
+            "kiwibuild_type_attr": {"$ref": "#/definitions/list_of_strings"},
+            "kiwibuild_bundle_name_format": {"type": "string"},
            "osbuild_target": {"type": "string"},
            "osbuild_release": {"$ref": "#/definitions/optional_string"},
            "osbuild_version": {"type": "string"},
@ -1188,14 +1268,41 @@ def make_schema():
                                },
                                "arches": {"$ref": "#/definitions/list_of_strings"},
                                "release": {"type": "string"},
-                                "repo": {"$ref": "#/definitions/list_of_strings"},
+                                "repo": {
+                                    "type": "array",
+                                    "items": {
+                                        "oneOf": [
+                                            {
+                                                "type": "object",
+                                                "additionalProperties": False,
+                                                "required": ["baseurl"],
+                                                "properties": {
+                                                    "baseurl": {"type": "string"},
+                                                    "package_sets": {
+                                                        "type": "array",
+                                                        "items": {"type": "string"},
+                                                    },
+                                                },
+                                            },
+                                            {"type": "string"},
+                                        ]
+                                    },
+                                },
                                "failable": {"$ref": "#/definitions/list_of_strings"},
                                "subvariant": {"type": "string"},
                                "ostree_url": {"type": "string"},
                                "ostree_ref": {"type": "string"},
                                "ostree_parent": {"type": "string"},
+                                "manifest_type": {"type": "string"},
+                                "customizations": {
+                                    "type": "object",
+                                    "additionalProperties": True,
+                                },
                                "upload_options": {
-                                    "oneOf": [
+                                    # this should be really 'oneOf', but the minimal
+                                    # required properties in AWSEC2 and GCP options
+                                    # overlap.
+                                    "anyOf": [
                                        # AWSEC2UploadOptions
                                        {
                                            "type": "object",
@ -1234,7 +1341,6 @@ def make_schema():
                                                "tenant_id",
                                                "subscription_id",
                                                "resource_group",
-                                                "location",
                                            ],
                                            "properties": {
                                                "tenant_id": {"type": "string"},
@ -1250,7 +1356,7 @@ def make_schema():
                                        {
                                            "type": "object",
                                            "additionalProperties": False,
-                                            "required": ["region", "bucket"],
+                                            "required": ["region"],
                                            "properties": {
                                                "region": {"type": "string"},
                                                "bucket": {"type": "string"},
@ -1308,9 +1414,6 @@ def make_schema():
                {"$ref": "#/definitions/strings"}
            ),
            "lorax_use_koji_plugin": {"type": "boolean", "default": False},
-            "signing_key_id": {"type": "string"},
-            "signing_key_password_file": {"type": "string"},
-            "signing_command": {"type": "string"},
            "productimg": {
                "deprecated": "remove it. Productimg phase has been removed"
            },
@ -1445,7 +1548,6 @@ def get_num_cpus():
 CONFIG_DEPS = {
    "buildinstall_method": {
        "conflicts": (
-            (lambda val: val == "buildinstall", ["lorax_options"]),
            (lambda val: not val, ["lorax_options", "buildinstall_kickstart"]),
        ),
    },
--- a/pungi/compose.py
+++ b/pungi/compose.py
@ -17,6 +17,7 @@
 __all__ = ("Compose",)


+import contextlib
 import errno
 import logging
 import os
@ -38,6 +39,7 @@ from dogpile.cache import make_region
 from pungi.graph import SimpleAcyclicOrientedGraph
 from pungi.wrappers.variants import VariantsXmlParser
 from pungi.paths import Paths
+from pungi.wrappers.kojiwrapper import KojiDownloadProxy
 from pungi.wrappers.scm import get_file_from_scm
 from pungi.util import (
    makedirs,
@ -57,14 +59,101 @@ except ImportError:
    SUPPORTED_MILESTONES = ["RC", "Update", "SecurityFix"]


+def is_status_fatal(status_code):
+    """Check if status code returned from CTS reports an error that is unlikely
+    to be fixed by retrying. Generally client errors (4XX) are fatal, with the
+    exception of 401 Unauthorized which could be caused by transient network
+    issue between compose host and KDC.
+    """
+    if status_code == 401:
+        return False
+    return status_code >= 400 and status_code < 500
+
+
@retry(wait_on=RequestException)
-def retry_request(method, url, data=None, auth=None):
+def retry_request(method, url, data=None, json_data=None, auth=None):
+    """
+    :param str method: Reqest method.
+    :param str url: Target URL.
+    :param dict data: form-urlencoded data to send in the body of the request.
+    :param dict json_data: json data to send in the body of the request.
+    """
    request_method = getattr(requests, method)
-    rv = request_method(url, json=data, auth=auth)
+    rv = request_method(url, data=data, json=json_data, auth=auth)
+    if is_status_fatal(rv.status_code):
+        try:
+            error = rv.json()
+        except ValueError:
+            error = rv.text
+        raise RuntimeError("%s responded with %d: %s" % (url, rv.status_code, error))
    rv.raise_for_status()
    return rv


+class BearerAuth(requests.auth.AuthBase):
+    def __init__(self, token):
+        self.token = token
+
+    def __call__(self, r):
+        r.headers["authorization"] = "Bearer " + self.token
+        return r
+
+
+@contextlib.contextmanager
+def cts_auth(pungi_conf):
+    """
+    :param dict pungi_conf: dict obj of pungi.json config.
+    """
+    auth = None
+    token = None
+    cts_keytab = pungi_conf.get("cts_keytab")
+    cts_oidc_token_url = os.environ.get("CTS_OIDC_TOKEN_URL", "") or pungi_conf.get(
+        "cts_oidc_token_url"
+    )
+
+    try:
+        if cts_keytab:
+            # requests-kerberos cannot accept custom keytab, we need to use
+            # environment variable for this. But we need to change environment
+            # only temporarily just for this single requests.post.
+            # So at first backup the current environment and revert to it
+            # after the requests call.
+            from requests_kerberos import HTTPKerberosAuth
+
+            auth = HTTPKerberosAuth()
+            environ_copy = dict(os.environ)
+            if "$HOSTNAME" in cts_keytab:
+                cts_keytab = cts_keytab.replace("$HOSTNAME", socket.gethostname())
+            os.environ["KRB5_CLIENT_KTNAME"] = cts_keytab
+            os.environ["KRB5CCNAME"] = "DIR:%s" % tempfile.mkdtemp()
+        elif cts_oidc_token_url:
+            cts_oidc_client_id = os.environ.get(
+                "CTS_OIDC_CLIENT_ID", ""
+            ) or pungi_conf.get("cts_oidc_client_id", "")
+            token = retry_request(
+                "post",
+                cts_oidc_token_url,
+                data={
+                    "grant_type": "client_credentials",
+                    "client_id": cts_oidc_client_id,
+                    "client_secret": os.environ.get("CTS_OIDC_CLIENT_SECRET", ""),
+                },
+            ).json()["access_token"]
+            auth = BearerAuth(token)
+            del token
+
+        yield auth
+    except Exception as e:
+        # Avoid leaking client secret in trackback
+        e.show_locals = False
+        raise e
+    finally:
+        if cts_keytab:
+            shutil.rmtree(os.environ["KRB5CCNAME"].split(":", 1)[1])
+            os.environ.clear()
+            os.environ.update(environ_copy)
+
+
 def get_compose_info(
    conf,
    compose_type="production",
@ -94,38 +183,19 @@ def get_compose_info(
    ci.compose.type = compose_type
    ci.compose.date = compose_date or time.strftime("%Y%m%d", time.localtime())
    ci.compose.respin = compose_respin or 0
+    ci.compose.id = ci.create_compose_id()

-    cts_url = conf.get("cts_url", None)
+    cts_url = conf.get("cts_url")
    if cts_url:
-        # Requests-kerberos cannot accept custom keytab, we need to use
-        # environment variable for this. But we need to change environment
-        # only temporarily just for this single requests.post.
-        # So at first backup the current environment and revert to it
-        # after the requests.post call.
-        cts_keytab = conf.get("cts_keytab", None)
-        authentication = get_authentication(conf)
-        if cts_keytab:
-            environ_copy = dict(os.environ)
-            if "$HOSTNAME" in cts_keytab:
-                cts_keytab = cts_keytab.replace("$HOSTNAME", socket.gethostname())
-            os.environ["KRB5_CLIENT_KTNAME"] = cts_keytab
-            os.environ["KRB5CCNAME"] = "DIR:%s" % tempfile.mkdtemp()
-
-        try:
-            # Create compose in CTS and get the reserved compose ID.
-            ci.compose.id = ci.create_compose_id()
-            url = os.path.join(cts_url, "api/1/composes/")
-            data = {
-                "compose_info": json.loads(ci.dumps()),
-                "parent_compose_ids": parent_compose_ids,
-                "respin_of": respin_of,
-            }
-            rv = retry_request("post", url, data=data, auth=authentication)
-        finally:
-            if cts_keytab:
-                shutil.rmtree(os.environ["KRB5CCNAME"].split(":", 1)[1])
-                os.environ.clear()
-                os.environ.update(environ_copy)
+        # Create compose in CTS and get the reserved compose ID.
+        url = os.path.join(cts_url, "api/1/composes/")
+        data = {
+            "compose_info": json.loads(ci.dumps()),
+            "parent_compose_ids": parent_compose_ids,
+            "respin_of": respin_of,
+        }
+        with cts_auth(conf) as authentication:
+            rv = retry_request("post", url, json_data=data, auth=authentication)

        # Update local ComposeInfo with received ComposeInfo.
        cts_ci = ComposeInfo()
@ -133,22 +203,9 @@ def get_compose_info(
        ci.compose.respin = cts_ci.compose.respin
        ci.compose.id = cts_ci.compose.id

-    else:
-        ci.compose.id = ci.create_compose_id()
-
    return ci


-def get_authentication(conf):
-    authentication = None
-    cts_keytab = conf.get("cts_keytab", None)
-    if cts_keytab:
-        from requests_kerberos import HTTPKerberosAuth
-
-        authentication = HTTPKerberosAuth()
-    return authentication
-
-
 def write_compose_info(compose_dir, ci):
    """
    Write ComposeInfo `ci` to `compose_dir` subdirectories.
@ -162,17 +219,20 @@ def write_compose_info(compose_dir, ci):


 def update_compose_url(compose_id, compose_dir, conf):
-    authentication = get_authentication(conf)
    cts_url = conf.get("cts_url", None)
    if cts_url:
        url = os.path.join(cts_url, "api/1/composes", compose_id)
        tp = conf.get("translate_paths", None)
        compose_url = translate_path_raw(tp, compose_dir)
+        if compose_url == compose_dir:
+            # We do not have a URL, do not attempt the update.
+            return
        data = {
            "action": "set_url",
            "compose_url": compose_url,
        }
-        return retry_request("patch", url, data=data, auth=authentication)
+        with cts_auth(conf) as authentication:
+            return retry_request("patch", url, json_data=data, auth=authentication)


 def get_compose_dir(
@ -183,11 +243,19 @@ def get_compose_dir(
    compose_respin=None,
    compose_label=None,
    already_exists_callbacks=None,
+    parent_compose_ids=None,
+    respin_of=None,
 ):
    already_exists_callbacks = already_exists_callbacks or []

    ci = get_compose_info(
-        conf, compose_type, compose_date, compose_respin, compose_label
+        conf,
+        compose_type,
+        compose_date,
+        compose_respin,
+        compose_label,
+        parent_compose_ids,
+        respin_of,
    )

    cts_url = conf.get("cts_url", None)
@ -342,6 +410,8 @@ class Compose(kobo.log.LoggingBase):
        else:
            self.cache_region = make_region().configure("dogpile.cache.null")

+        self.koji_downloader = KojiDownloadProxy.from_config(self.conf, self._logger)
+
    get_compose_info = staticmethod(get_compose_info)
    write_compose_info = staticmethod(write_compose_info)
    get_compose_dir = staticmethod(get_compose_dir)
@ -637,7 +707,7 @@ class Compose(kobo.log.LoggingBase):
                separators=(",", ": "),
            )

-    def traceback(self, detail=None):
+    def traceback(self, detail=None, show_locals=True):
        """Store an extended traceback. This method should only be called when
        handling an exception.

@ -648,8 +718,10 @@ class Compose(kobo.log.LoggingBase):
            basename += "-" + detail
        tb_path = self.paths.log.log_file("global", basename)
        self.log_error("Extended traceback in: %s", tb_path)
-        with open(tb_path, "wb") as f:
-            f.write(kobo.tback.Traceback().get_traceback())
+        tback = kobo.tback.Traceback(show_locals=show_locals).get_traceback()
+        # Kobo 0.36.0 returns traceback as str, older versions return bytes
+        with open(tb_path, "wb" if isinstance(tback, bytes) else "w") as f:
+            f.write(tback)

    def load_old_compose_config(self):
        """
--- a/pungi/createiso.py
+++ b/pungi/createiso.py
@ -5,11 +5,14 @@ from __future__ import print_function
 import os
 import six
 from collections import namedtuple
+from kobo.shortcuts import run
 from six.moves import shlex_quote

 from .wrappers import iso
 from .wrappers.jigdo import JigdoWrapper

+from .phases.buildinstall import BOOT_CONFIGS, BOOT_IMAGES
+

 CreateIsoOpts = namedtuple(
    "CreateIsoOpts",
@ -64,10 +67,6 @@ def make_image(f, opts):
                os.path.join("$TEMPLATE", "config_files/ppc"),
                hfs_compat=opts.hfs_compat,
            )
-        elif opts.buildinstall_method == "buildinstall":
-            mkisofs_kwargs["boot_args"] = iso.get_boot_options(
-                opts.arch, "/usr/lib/anaconda-runtime/boot"
-            )

    # ppc(64) doesn't seem to support utf-8
    if opts.arch in ("ppc", "ppc64", "ppc64le"):
@ -118,23 +117,65 @@ def make_jigdo(f, opts):
    emit(f, cmd)


+def _get_perms(fs_path):
+    """Compute proper permissions for a file.
+
+    This mimicks what -rational-rock option of genisoimage does. All read bits
+    are set, so that files and directories are globally readable. If any
+    execute bit is set for a file, set them all. No writes are allowed and
+    special bits are erased too.
+    """
+    statinfo = os.stat(fs_path)
+    perms = 0o444
+    if statinfo.st_mode & 0o111:
+        perms |= 0o111
+    return perms
+
+
 def write_xorriso_commands(opts):
+    # Create manifest for the boot.iso listing all contents
+    boot_iso_manifest = "%s.manifest" % os.path.join(
+        opts.script_dir, os.path.basename(opts.boot_iso)
+    )
+    run(
+        iso.get_manifest_cmd(
+            opts.boot_iso, opts.use_xorrisofs, output_file=boot_iso_manifest
+        )
+    )
+    # Find which files may have been updated by pungi. This only includes a few
+    # files from tweaking buildinstall and .discinfo metadata. There's no good
+    # way to detect whether the boot config files actually changed, so we may
+    # be updating files in the ISO with the same data.
+    UPDATEABLE_FILES = set(BOOT_IMAGES + BOOT_CONFIGS + [".discinfo"])
+    updated_files = set()
+    excluded_files = set()
+    with open(boot_iso_manifest) as f:
+        for line in f:
+            path = line.lstrip("/").rstrip("\n")
+            if path in UPDATEABLE_FILES:
+                updated_files.add(path)
+            else:
+                excluded_files.add(path)
+
    script = os.path.join(opts.script_dir, "xorriso-%s.txt" % id(opts))
    with open(script, "w") as f:
-        emit(f, "-indev %s" % opts.boot_iso)
-        emit(f, "-outdev %s" % os.path.join(opts.output_dir, opts.iso_name))
-        emit(f, "-boot_image any replay")
+        for cmd in iso.xorriso_commands(
+            opts.arch, opts.boot_iso, os.path.join(opts.output_dir, opts.iso_name)
+        ):
+            emit(f, " ".join(cmd))
        emit(f, "-volid %s" % opts.volid)

        with open(opts.graft_points) as gp:
            for line in gp:
                iso_path, fs_path = line.strip().split("=", 1)
-                emit(f, "-map %s %s" % (fs_path, iso_path))
-
-        if opts.arch == "ppc64le":
-            # This is needed for the image to be bootable.
-            emit(f, "-as mkisofs -U --")
+                if iso_path in excluded_files:
+                    continue
+                cmd = "-update" if iso_path in updated_files else "-map"
+                emit(f, "%s %s %s" % (cmd, fs_path, iso_path))
+                emit(f, "-chmod 0%o %s" % (_get_perms(fs_path), iso_path))

+        emit(f, "-chown_r 0 /")
+        emit(f, "-chgrp_r 0 /")
        emit(f, "-end")
    return script

--- a/pungi/gather.py
+++ b/pungi/gather.py
@ -1118,7 +1118,6 @@ class Pungi(PungiBase):
        self.logger.info("Finished gathering package objects.")

    def gather(self):
-
        # get package objects according to the input list
        self.getPackageObjects()
        if self.is_sources:
--- a/pungi/gather_dnf.py
+++ b/pungi/gather_dnf.py
@ -15,17 +15,21 @@


 from enum import Enum
-from itertools import count
+from functools import cmp_to_key
+from itertools import count, groupby
+import errno
 import logging
 import os
 import re

 from kobo.rpmlib import parse_nvra
+import rpm

 import pungi.common
 import pungi.dnf_wrapper
 import pungi.multilib_dnf
 import pungi.util
+from pungi import arch_utils
 from pungi.linker import Linker
 from pungi.profiler import Profiler
 from pungi.util import DEBUG_PATTERNS
@ -36,6 +40,20 @@ def get_source_name(pkg):
    return pkg.sourcerpm.rsplit("-", 2)[0]


+def filter_dotarch(queue, pattern, **kwargs):
+    """Filter queue for packages matching the pattern. If pattern matches the
+    dotarch format of <name>.<arch>, it is processed as such. Otherwise it is
+    treated as just a name.
+    """
+    kwargs["name__glob"] = pattern
+    if "." in pattern:
+        name, arch = pattern.split(".", 1)
+        if arch in arch_utils.arches or arch == "noarch":
+            kwargs["name__glob"] = name
+            kwargs["arch"] = arch
+    return queue.filter(**kwargs).apply()
+
+
 class GatherOptions(pungi.common.OptionsBase):
    def __init__(self, **kwargs):
        super(GatherOptions, self).__init__()
@ -245,12 +263,36 @@ class Gather(GatherBase):
        # from lookaside. This can be achieved by removing any package that is
        # also in lookaside from the list.
        lookaside_pkgs = set()
-        for pkg in package_list:
-            if pkg.repoid in self.opts.lookaside_repos:
-                lookaside_pkgs.add("{0.name}-{0.evr}".format(pkg))

-        if self.opts.greedy_method == "all":
-            return list(package_list)
+        if self.opts.lookaside_repos:
+            # We will call `latest()` to get the highest version packages only.
+            # However, that is per name and architecture. If a package switches
+            # from arched to noarch or the other way, it is possible that the
+            # package_list contains different versions in main repos and in
+            # lookaside repos.
+            # We need to manually filter the latest version.
+            def vercmp(x, y):
+                return rpm.labelCompare(x[1], y[1])
+
+            # Annotate the packages with their version.
+            versioned_packages = [
+                (pkg, (str(pkg.epoch) or "0", pkg.version, pkg.release))
+                for pkg in package_list
+            ]
+            # Sort the packages newest first.
+            sorted_packages = sorted(
+                versioned_packages, key=cmp_to_key(vercmp), reverse=True
+            )
+            # Group packages by version, take the first group and discard the
+            # version info from the tuple.
+            package_list = list(
+                x[0] for x in next(groupby(sorted_packages, key=lambda x: x[1]))[1]
+            )
+
+            # Now we can decide what is used from lookaside.
+            for pkg in package_list:
+                if pkg.repoid in self.opts.lookaside_repos:
+                    lookaside_pkgs.add("{0.name}-{0.evr}".format(pkg))

        all_pkgs = []
        for pkg in package_list:
@ -263,16 +305,21 @@ class Gather(GatherBase):

        if not debuginfo:
            native_pkgs = set(
-                self.q_native_binary_packages.filter(pkg=all_pkgs).apply()
+                self.q_native_binary_packages.filter(pkg=all_pkgs).latest().apply()
            )
            multilib_pkgs = set(
-                self.q_multilib_binary_packages.filter(pkg=all_pkgs).apply()
+                self.q_multilib_binary_packages.filter(pkg=all_pkgs).latest().apply()
            )
        else:
-            native_pkgs = set(self.q_native_debug_packages.filter(pkg=all_pkgs).apply())
-            multilib_pkgs = set(
-                self.q_multilib_debug_packages.filter(pkg=all_pkgs).apply()
+            native_pkgs = set(
+                self.q_native_debug_packages.filter(pkg=all_pkgs).latest().apply()
            )
+            multilib_pkgs = set(
+                self.q_multilib_debug_packages.filter(pkg=all_pkgs).latest().apply()
+            )
+
+        if self.opts.greedy_method == "all":
+            return list(native_pkgs | multilib_pkgs)

        result = set()

@ -392,9 +439,7 @@ class Gather(GatherBase):
        """Given an name of a queue (stored as attribute in `self`), exclude
        all given packages and keep only the latest per package name and arch.
        """
-        setattr(
-            self, queue, getattr(self, queue).filter(pkg__neq=exclude).latest().apply()
-        )
+        setattr(self, queue, getattr(self, queue).filter(pkg__neq=exclude).apply())

    @Profiler("Gather._apply_excludes()")
    def _apply_excludes(self, excludes):
@ -420,12 +465,16 @@ class Gather(GatherBase):
                        name__glob=pattern[:-4], reponame__neq=self.opts.lookaside_repos
                    )
                elif pungi.util.pkg_is_debug(pattern):
-                    pkgs = self.q_debug_packages.filter(
-                        name__glob=pattern, reponame__neq=self.opts.lookaside_repos
+                    pkgs = filter_dotarch(
+                        self.q_debug_packages,
+                        pattern,
+                        reponame__neq=self.opts.lookaside_repos,
                    )
                else:
-                    pkgs = self.q_binary_packages.filter(
-                        name__glob=pattern, reponame__neq=self.opts.lookaside_repos
+                    pkgs = filter_dotarch(
+                        self.q_binary_packages,
+                        pattern,
+                        reponame__neq=self.opts.lookaside_repos,
                    )

                exclude.update(pkgs)
@ -491,21 +540,19 @@ class Gather(GatherBase):
                                name__glob=pattern[:-2]
                            ).apply()
                        else:
-                            pkgs = self.q_debug_packages.filter(
-                                name__glob=pattern
-                            ).apply()
+                            pkgs = filter_dotarch(self.q_debug_packages, pattern)
                    else:
                        if pattern.endswith(".+"):
                            pkgs = self.q_multilib_binary_packages.filter(
                                name__glob=pattern[:-2]
                            ).apply()
                        else:
-                            pkgs = self.q_binary_packages.filter(
-                                name__glob=pattern
-                            ).apply()
+                            pkgs = filter_dotarch(self.q_binary_packages, pattern)

                if not pkgs:
-                    self.logger.error("No package matches pattern %s" % pattern)
+                    self.logger.error(
+                        "Could not find a match for %s in any configured repo", pattern
+                    )

                # The pattern could have been a glob. In that case we want to
                # group the packages by name and get best match in those
@ -616,7 +663,6 @@ class Gather(GatherBase):
            return added

        for pkg in self.result_debug_packages.copy():
-
            if pkg not in self.finished_add_debug_package_deps:
                deps = self._get_package_deps(pkg, debuginfo=True)
                for i, req in deps:
@ -784,7 +830,6 @@ class Gather(GatherBase):
                continue

            debug_pkgs = []
-            pkg_in_lookaside = pkg.repoid in self.opts.lookaside_repos
            for i in candidates:
                if pkg.arch != i.arch:
                    continue
@ -792,8 +837,14 @@ class Gather(GatherBase):
                    # If it's not debugsource package or does not match name of
                    # the package, we don't want it in.
                    continue
-                if i.repoid in self.opts.lookaside_repos or pkg_in_lookaside:
+                if self.is_from_lookaside(i):
                    self._set_flag(i, PkgFlag.lookaside)
+                srpm_name = i.sourcerpm.rsplit("-", 2)[0]
+                if srpm_name in self.opts.fulltree_excludes:
+                    self._set_flag(i, PkgFlag.fulltree_exclude)
+                if PkgFlag.input in self.result_package_flags.get(srpm_name, set()):
+                    # If src rpm is marked as input, mark debuginfo as input too
+                    self._set_flag(i, PkgFlag.input)
                if i not in self.result_debug_packages:
                    added.add(i)
                    debug_pkgs.append(i)
@ -1030,9 +1081,12 @@ class Gather(GatherBase):
            # Link downloaded package in (or link package from file repo)
            try:
                linker.link(pkg.localPkg(), target)
-            except Exception:
-                self.logger.error("Unable to link %s from the yum cache." % pkg.name)
-                raise
+            except Exception as ex:
+                if ex.errno == errno.EEXIST:
+                    self.logger.warning("Downloaded package exists in %s", target)
+                else:
+                    self.logger.error("Unable to link %s from the yum cache.", pkg.name)
+                    raise

    def log_count(self, msg, method, *args):
        """
--- a/pungi/metadata.py
+++ b/pungi/metadata.py
@ -306,11 +306,6 @@ def write_tree_info(compose, arch, variant, timestamp=None, bi=None):
    if variant.type in ("addon",) or variant.is_empty:
        return

-    compose.log_debug(
-        "on arch '%s' looking at variant '%s' of type '%s'"
-        % (arch, variant, variant.type)
-    )
-
    if not timestamp:
        timestamp = int(time.time())
    else:
--- a/pungi/ostree/init.py
+++ b/pungi/ostree/init.py
@ -19,6 +19,7 @@ import logging

 from .tree import Tree
 from .installer import Installer
+from .container import Container


 def main(args=None):
@ -71,6 +72,43 @@ def main(args=None):
        help="use unified core mode in rpm-ostree",
    )

+    container = subparser.add_parser(
+        "container", help="Compose OSTree native container"
+    )
+    container.set_defaults(_class=Container, func="run")
+    container.add_argument(
+        "--name",
+        required=True,
+        help="the name of the the OCI archive (required)",
+    )
+    container.add_argument(
+        "--path",
+        required=True,
+        help="where to output the OCI archive (required)",
+    )
+    container.add_argument(
+        "--treefile",
+        metavar="FILE",
+        required=True,
+        help="treefile for rpm-ostree (required)",
+    )
+    container.add_argument(
+        "--log-dir",
+        metavar="DIR",
+        required=True,
+        help="where to log output (required).",
+    )
+    container.add_argument(
+        "--extra-config", metavar="FILE", help="JSON file contains extra configurations"
+    )
+    container.add_argument(
+        "-v",
+        "--version",
+        metavar="VERSION",
+        required=True,
+        help="version identifier (required)",
+    )
+
    installerp = subparser.add_parser(
        "installer", help="Create an OSTree installer image"
    )
--- a/pungi/ostree/container.py
+++ b/pungi/ostree/container.py
@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <https://gnu.org/licenses/>.
+
+
+import os
+import json
+import six
+from six.moves import shlex_quote
+
+
+from .base import OSTree
+from .utils import tweak_treeconf
+
+
+def emit(cmd):
+    """Print line of shell code into the stream."""
+    if isinstance(cmd, six.string_types):
+        print(cmd)
+    else:
+        print(" ".join([shlex_quote(x) for x in cmd]))
+
+
+class Container(OSTree):
+    def _make_container(self):
+        """Compose OSTree Container Native image"""
+        stamp_file = os.path.join(self.logdir, "%s.stamp" % self.name)
+        cmd = [
+            "rpm-ostree",
+            "compose",
+            "image",
+            # Always initialize for now
+            "--initialize",
+            # Touch the file if a new commit was created. This can help us tell
+            # if the commitid file is missing because no commit was created or
+            # because something went wrong.
+            "--touch-if-changed=%s" % stamp_file,
+            self.treefile,
+        ]
+        fullpath = os.path.join(self.path, "%s.ociarchive" % self.name)
+        cmd.append(fullpath)
+
+        # Set the umask to be more permissive so directories get group write
+        # permissions. See https://pagure.io/releng/issue/8811#comment-629051
+        emit("umask 0002")
+        emit(cmd)
+
+    def run(self):
+        self.name = self.args.name
+        self.path = self.args.path
+        self.treefile = self.args.treefile
+        self.logdir = self.args.log_dir
+        self.extra_config = self.args.extra_config
+
+        if self.extra_config:
+            self.extra_config = json.load(open(self.extra_config, "r"))
+            repos = self.extra_config.get("repo", [])
+            keep_original_sources = self.extra_config.get(
+                "keep_original_sources", False
+            )
+        else:
+            # missing extra_config mustn't affect tweak_treeconf call
+            repos = []
+            keep_original_sources = True
+
+        update_dict = {"automatic-version-prefix": self.args.version}
+
+        self.treefile = tweak_treeconf(
+            self.treefile,
+            source_repos=repos,
+            keep_original_sources=keep_original_sources,
+            update_dict=update_dict,
+        )
+
+        self._make_container()
--- a/pungi/phases/init.py
+++ b/pungi/phases/init.py
@ -25,9 +25,9 @@ from .buildinstall import BuildinstallPhase  # noqa
 from .extra_files import ExtraFilesPhase  # noqa
 from .createiso import CreateisoPhase  # noqa
 from .extra_isos import ExtraIsosPhase  # noqa
-from .live_images import LiveImagesPhase  # noqa
 from .image_build import ImageBuildPhase  # noqa
 from .image_container import ImageContainerPhase  # noqa
+from .kiwibuild import KiwiBuildPhase  # noqa
 from .osbuild import OSBuildPhase  # noqa
 from .repoclosure import RepoclosurePhase  # noqa
 from .test import TestPhase  # noqa
@ -35,6 +35,7 @@ from .image_checksum import ImageChecksumPhase  # noqa
 from .livemedia_phase import LiveMediaPhase  # noqa
 from .ostree import OSTreePhase  # noqa
 from .ostree_installer import OstreeInstallerPhase  # noqa
+from .ostree_container import OSTreeContainerPhase  # noqa
 from .osbs import OSBSPhase  # noqa
 from .phases_metadata import gather_phases_metadata  # noqa

--- a/pungi/phases/buildinstall.py
+++ b/pungi/phases/buildinstall.py
@ -31,14 +31,14 @@ from six.moves import shlex_quote
 from pungi.arch import get_valid_arches
 from pungi.util import get_volid, get_arch_variant_data
 from pungi.util import get_file_size, get_mtime, failable, makedirs
-from pungi.util import copy_all, translate_path, move_all
+from pungi.util import copy_all, translate_path
 from pungi.wrappers.lorax import LoraxWrapper
 from pungi.wrappers import iso
 from pungi.wrappers.scm import get_file
 from pungi.wrappers.scm import get_file_from_scm
 from pungi.wrappers import kojiwrapper
 from pungi.phases.base import PhaseBase
-from pungi.runroot import Runroot
+from pungi.runroot import Runroot, download_and_extract_archive


 class BuildinstallPhase(PhaseBase):
@ -144,7 +144,7 @@ class BuildinstallPhase(PhaseBase):
        )
        if self.compose.has_comps:
            comps_repo = self.compose.paths.work.comps_repo(arch, variant)
-            if final_output_dir != output_dir:
+            if final_output_dir != output_dir or self.lorax_use_koji_plugin:
                comps_repo = translate_path(self.compose, comps_repo)
            repos.append(comps_repo)

@ -169,7 +169,6 @@ class BuildinstallPhase(PhaseBase):
                "rootfs-size": rootfs_size,
                "dracut-args": dracut_args,
                "skip_branding": skip_branding,
-                "outputdir": output_dir,
                "squashfs_only": squashfs_only,
                "configuration_file": configuration_file,
            }
@ -219,10 +218,6 @@ class BuildinstallPhase(PhaseBase):
        return repos

    def run(self):
-        lorax = LoraxWrapper()
-        product = self.compose.conf["release_name"]
-        version = self.compose.conf["release_version"]
-        release = self.compose.conf["release_version"]
        disc_type = self.compose.conf["disc_types"].get("dvd", "dvd")

        # Prepare kickstart file for final images.
@ -239,7 +234,7 @@ class BuildinstallPhase(PhaseBase):
            )
            makedirs(final_output_dir)
            repo_baseurls = self.get_repos(arch)
-            if final_output_dir != output_dir:
+            if final_output_dir != output_dir or self.lorax_use_koji_plugin:
                repo_baseurls = [translate_path(self.compose, r) for r in repo_baseurls]

            if self.buildinstall_method == "lorax":
@ -275,29 +270,12 @@ class BuildinstallPhase(PhaseBase):
                            ),
                        )
                    )
-            elif self.buildinstall_method == "buildinstall":
-                volid = get_volid(self.compose, arch, disc_type=disc_type)
-                commands.append(
-                    (
-                        None,
-                        lorax.get_buildinstall_cmd(
-                            product,
-                            version,
-                            release,
-                            repo_baseurls,
-                            output_dir,
-                            is_final=self.compose.supported,
-                            buildarch=arch,
-                            volid=volid,
-                        ),
-                    )
-                )
            else:
                raise ValueError(
                    "Unsupported buildinstall method: %s" % self.buildinstall_method
                )

-            for (variant, cmd) in commands:
+            for variant, cmd in commands:
                self.pool.add(BuildinstallThread(self.pool))
                self.pool.queue_put(
                    (self.compose, arch, variant, cmd, self.pkgset_phase)
@ -364,9 +342,17 @@ BOOT_CONFIGS = [
    "EFI/BOOT/BOOTX64.conf",
    "EFI/BOOT/grub.cfg",
 ]
+BOOT_IMAGES = [
+    "images/efiboot.img",
+]


 def tweak_configs(path, volid, ks_file, configs=BOOT_CONFIGS, logger=None):
+    """
+    Put escaped volume ID and possibly kickstart file into the boot
+    configuration files.
+    :returns: list of paths to modified config files
+    """
    volid_escaped = volid.replace(" ", r"\x20").replace("\\", "\\\\")
    volid_escaped_2 = volid_escaped.replace("\\", "\\\\")
    found_configs = []
@ -374,7 +360,6 @@ def tweak_configs(path, volid, ks_file, configs=BOOT_CONFIGS, logger=None):
        config_path = os.path.join(path, config)
        if not os.path.exists(config_path):
            continue
-        found_configs.append(config)

        with open(config_path, "r") as f:
            data = original_data = f.read()
@ -394,8 +379,13 @@ def tweak_configs(path, volid, ks_file, configs=BOOT_CONFIGS, logger=None):
        with open(config_path, "w") as f:
            f.write(data)

-        if logger and data != original_data:
-            logger.info("Boot config %s changed" % config_path)
+        if data != original_data:
+            found_configs.append(config)
+            if logger:
+                # Generally lorax should create file with correct volume id
+                # already. If we don't have a kickstart, this function should
+                # be a no-op.
+                logger.info("Boot config %s changed" % config_path)

    return found_configs

@ -434,31 +424,32 @@ def tweak_buildinstall(
    if kickstart_file and found_configs:
        shutil.copy2(kickstart_file, os.path.join(dst, "ks.cfg"))

-    images = [
-        os.path.join(tmp_dir, "images", "efiboot.img"),
-    ]
-    for image in images:
-        if not os.path.isfile(image):
-            continue
+    images = [os.path.join(tmp_dir, img) for img in BOOT_IMAGES]
+    if found_configs:
+        for image in images:
+            if not os.path.isfile(image):
+                continue

-        with iso.mount(
-            image,
-            logger=compose._logger,
-            use_guestmount=compose.conf.get("buildinstall_use_guestmount"),
-        ) as mount_tmp_dir:
-            for config in BOOT_CONFIGS:
-                config_path = os.path.join(tmp_dir, config)
-                config_in_image = os.path.join(mount_tmp_dir, config)
+            with iso.mount(
+                image,
+                logger=compose._logger,
+                use_guestmount=compose.conf.get("buildinstall_use_guestmount"),
+            ) as mount_tmp_dir:
+                for config in found_configs:
+                    # Put each modified config file into the image (overwriting the
+                    # original).
+                    config_path = os.path.join(tmp_dir, config)
+                    config_in_image = os.path.join(mount_tmp_dir, config)

-                if os.path.isfile(config_in_image):
-                    cmd = [
-                        "cp",
-                        "-v",
-                        "--remove-destination",
-                        config_path,
-                        config_in_image,
-                    ]
-                    run(cmd)
+                    if os.path.isfile(config_in_image):
+                        cmd = [
+                            "cp",
+                            "-v",
+                            "--remove-destination",
+                            config_path,
+                            config_in_image,
+                        ]
+                        run(cmd)

    # HACK: make buildinstall files world readable
    run("chmod -R a+rX %s" % shlex_quote(tmp_dir))
@ -530,7 +521,10 @@ def link_boot_iso(compose, arch, variant, can_fail):
    setattr(img, "can_fail", can_fail)
    setattr(img, "deliverable", "buildinstall")
    try:
-        img.volume_id = iso.get_volume_id(new_boot_iso_path)
+        img.volume_id = iso.get_volume_id(
+            new_boot_iso_path,
+            compose.conf.get("createiso_use_xorrisofs"),
+        )
    except RuntimeError:
        pass
    compose.im.add(variant.uid, arch, img)
@ -718,8 +712,8 @@ class BuildinstallThread(WorkerThread):
        # input on RPM level.
        cmd_copy = copy(cmd)
        for key in ["outputdir", "sources"]:
-            del cmd_copy[key]
-            del old_metadata["cmd"][key]
+            cmd_copy.pop(key, None)
+            old_metadata["cmd"].pop(key, None)

        # Do not reuse if command line arguments are not the same.
        if old_metadata["cmd"] != cmd_copy:
@ -814,8 +808,6 @@ class BuildinstallThread(WorkerThread):
        if buildinstall_method == "lorax":
            packages += ["lorax"]
            chown_paths.append(_get_log_dir(compose, variant, arch))
-        elif buildinstall_method == "buildinstall":
-            packages += ["anaconda"]
        packages += get_arch_variant_data(
            compose.conf, "buildinstall_packages", arch, variant
        )
@ -836,13 +828,13 @@ class BuildinstallThread(WorkerThread):

        # Start the runroot task.
        runroot = Runroot(compose, phase="buildinstall")
+        task_id = None
        if buildinstall_method == "lorax" and lorax_use_koji_plugin:
-            runroot.run_pungi_buildinstall(
+            task_id = runroot.run_pungi_buildinstall(
                cmd,
                log_file=log_file,
                arch=arch,
                packages=packages,
-                mounts=[compose.topdir],
                weight=compose.conf["runroot_weights"].get("buildinstall"),
            )
        else:
@ -875,19 +867,17 @@ class BuildinstallThread(WorkerThread):
            log_dir = os.path.join(output_dir, "logs")
            copy_all(log_dir, final_log_dir)
        elif lorax_use_koji_plugin:
-            # If Koji pungi-buildinstall is used, then the buildinstall results are
-            # not stored directly in `output_dir` dir, but in "results" and "logs"
-            # subdirectories. We need to move them to final_output_dir.
-            results_dir = os.path.join(output_dir, "results")
-            move_all(results_dir, final_output_dir, rm_src_dir=True)
+            # If Koji pungi-buildinstall is used, then the buildinstall results
+            # are attached as outputs to the Koji task. Download and unpack
+            # them to the correct location.
+            download_and_extract_archive(
+                compose, task_id, "results.tar.gz", final_output_dir
+            )

-            # Get the log_dir into which we should copy the resulting log files.
+            # Download the logs into proper location too.
            log_fname = "buildinstall-%s-logs/dummy" % variant.uid
            final_log_dir = os.path.dirname(compose.paths.log.log_file(arch, log_fname))
-            if not os.path.exists(final_log_dir):
-                makedirs(final_log_dir)
-            log_dir = os.path.join(output_dir, "logs")
-            move_all(log_dir, final_log_dir, rm_src_dir=True)
+            download_and_extract_archive(compose, task_id, "logs.tar.gz", final_log_dir)

        rpms = runroot.get_buildroot_rpms()
        self._write_buildinstall_metadata(
--- a/pungi/phases/createiso.py
+++ b/pungi/phases/createiso.py
@ -14,6 +14,7 @@
 # along with this program; if not, see <https://gnu.org/licenses/>.


+import itertools
 import os
 import random
 import shutil
@ -23,7 +24,7 @@ import json
 import productmd.treeinfo
 from productmd.images import Image
 from kobo.threads import ThreadPool, WorkerThread
-from kobo.shortcuts import run, relative_path
+from kobo.shortcuts import run, relative_path, compute_file_checksums
 from six.moves import shlex_quote

 from pungi.wrappers import iso
@ -154,6 +155,13 @@ class CreateisoPhase(PhaseLoggerMixin, PhaseBase):
            disc_num=cmd["disc_num"],
            disc_count=cmd["disc_count"],
        )
+        if self.compose.notifier:
+            self.compose.notifier.send(
+                "createiso-imagedone",
+                file=cmd["iso_path"],
+                arch=arch,
+                variant=str(variant),
+            )

    def try_reuse(self, cmd, variant, arch, opts):
        """Try to reuse image from previous compose.
@ -181,6 +189,14 @@ class CreateisoPhase(PhaseLoggerMixin, PhaseBase):
        if not old_config:
            self.logger.info("%s - no config for old compose", log_msg)
            return False
+
+        # Disable reuse if unsigned packages are allowed. The older compose
+        # could have unsigned packages, and those may have been signed since
+        # then. We want to regenerate the ISO to have signatures.
+        if None in self.compose.conf["sigkeys"]:
+            self.logger.info("%s - unsigned packages are allowed", log_msg)
+            return False
+
        # Convert current configuration to JSON and back to encode it similarly
        # to the old one
        config = json.loads(json.dumps(self.compose.conf))
@ -369,7 +385,7 @@ class CreateisoPhase(PhaseLoggerMixin, PhaseBase):
        if self.compose.notifier:
            self.compose.notifier.send("createiso-targets", deliverables=deliverables)

-        for (cmd, variant, arch) in commands:
+        for cmd, variant, arch in commands:
            self.pool.add(CreateIsoThread(self.pool))
            self.pool.queue_put((self.compose, cmd, variant, arch))

@ -450,7 +466,14 @@ class CreateIsoThread(WorkerThread):

        try:
            run_createiso_command(
-                num, compose, bootable, arch, cmd["cmd"], mounts, log_file
+                num,
+                compose,
+                bootable,
+                arch,
+                cmd["cmd"],
+                mounts,
+                log_file,
+                cmd["iso_path"],
            )
        except Exception:
            self.fail(compose, cmd, variant, arch)
@ -517,7 +540,10 @@ def add_iso_to_metadata(
    setattr(img, "can_fail", compose.can_fail(variant, arch, "iso"))
    setattr(img, "deliverable", "iso")
    try:
-        img.volume_id = iso.get_volume_id(iso_path)
+        img.volume_id = iso.get_volume_id(
+            iso_path,
+            compose.conf.get("createiso_use_xorrisofs"),
+        )
    except RuntimeError:
        pass
    if arch == "src":
@ -528,7 +554,9 @@ def add_iso_to_metadata(
    return img


-def run_createiso_command(num, compose, bootable, arch, cmd, mounts, log_file):
+def run_createiso_command(
+    num, compose, bootable, arch, cmd, mounts, log_file, iso_path
+):
    packages = [
        "coreutils",
        "xorriso" if compose.conf.get("createiso_use_xorrisofs") else "genisoimage",
@ -539,7 +567,6 @@ def run_createiso_command(num, compose, bootable, arch, cmd, mounts, log_file):
    if bootable:
        extra_packages = {
            "lorax": ["lorax", "which"],
-            "buildinstall": ["anaconda"],
        }
        packages.extend(extra_packages[compose.conf["buildinstall_method"]])

@ -571,6 +598,76 @@ def run_createiso_command(num, compose, bootable, arch, cmd, mounts, log_file):
        weight=compose.conf["runroot_weights"].get("createiso"),
    )

+    if bootable and compose.conf.get("createiso_use_xorrisofs"):
+        fix_treeinfo_checksums(compose, iso_path, arch)
+
+
+def fix_treeinfo_checksums(compose, iso_path, arch):
+    """It is possible for the ISO to contain a .treefile with incorrect
+    checksums. By modifying the ISO (adding files) some of the images may
+    change.
+
+    This function fixes that after the fact by looking for incorrect checksums,
+    recalculating them and updating the .treeinfo file. Since the size of the
+    file doesn't change, this seems to not change any images.
+    """
+    modified = False
+    with iso.mount(iso_path, compose._logger) as mountpoint:
+        ti = productmd.TreeInfo()
+        ti.load(os.path.join(mountpoint, ".treeinfo"))
+        for image, (type_, expected) in ti.checksums.checksums.items():
+            checksums = compute_file_checksums(os.path.join(mountpoint, image), [type_])
+            actual = checksums[type_]
+            if actual == expected:
+                # Everything fine here, skip to next image.
+                continue
+
+            compose.log_debug("%s: %s: checksum mismatch", iso_path, image)
+            # Update treeinfo with correct checksum
+            ti.checksums.checksums[image] = (type_, actual)
+            modified = True
+
+    if not modified:
+        compose.log_debug("%s: All checksums match, nothing to do.", iso_path)
+        return
+
+    try:
+        tmpdir = compose.mkdtemp(arch, prefix="fix-checksum-")
+        # Write modified .treeinfo
+        ti_path = os.path.join(tmpdir, ".treeinfo")
+        compose.log_debug("Storing modified .treeinfo in %s", ti_path)
+        ti.dump(ti_path)
+        # Write a modified DVD into a temporary path, that is atomically moved
+        # over the original file.
+        fixed_path = os.path.join(tmpdir, "fixed-checksum-dvd.iso")
+        cmd = ["xorriso"]
+        cmd.extend(
+            itertools.chain.from_iterable(
+                iso.xorriso_commands(arch, iso_path, fixed_path)
+            )
+        )
+        cmd.extend(["-map", ti_path, ".treeinfo"])
+        run(
+            cmd,
+            logfile=compose.paths.log.log_file(
+                arch, "checksum-fix_generate_%s" % os.path.basename(iso_path)
+            ),
+        )
+        # The modified ISO no longer has implanted MD5, so that needs to be
+        # fixed again.
+        compose.log_debug("Implanting new MD5 to %s fixed_path")
+        run(
+            iso.get_implantisomd5_cmd(fixed_path, compose.supported),
+            logfile=compose.paths.log.log_file(
+                arch, "checksum-fix_implantisomd5_%s" % os.path.basename(iso_path)
+            ),
+        )
+        # All done, move the updated image to the final location.
+        compose.log_debug("Updating %s", iso_path)
+        os.rename(fixed_path, iso_path)
+    finally:
+        shutil.rmtree(tmpdir)
+

 def split_iso(compose, arch, variant, no_split=False, logger=None):
    """
--- a/pungi/phases/extra_isos.py
+++ b/pungi/phases/extra_isos.py
@ -76,7 +76,7 @@ class ExtraIsosPhase(PhaseLoggerMixin, ConfigGuardedPhase, PhaseBase):
                for arch in sorted(arches):
                    commands.append((config, variant, arch))

-        for (config, variant, arch) in commands:
+        for config, variant, arch in commands:
            self.pool.add(ExtraIsosThread(self.pool, self.bi))
            self.pool.queue_put((self.compose, config, variant, arch))

@ -166,6 +166,7 @@ class ExtraIsosThread(WorkerThread):
                log_file=compose.paths.log.log_file(
                    arch, "extraiso-%s" % os.path.basename(iso_path)
                ),
+                iso_path=iso_path,
            )

        img = add_iso_to_metadata(
@ -204,6 +205,14 @@ class ExtraIsosThread(WorkerThread):
        if not old_config:
            self.pool.log_info("%s - no config for old compose", log_msg)
            return False
+
+        # Disable reuse if unsigned packages are allowed. The older compose
+        # could have unsigned packages, and those may have been signed since
+        # then. We want to regenerate the ISO to have signatures.
+        if None in compose.conf["sigkeys"]:
+            self.pool.log_info("%s - unsigned packages are allowed", log_msg)
+            return False
+
        # Convert current configuration to JSON and back to encode it similarly
        # to the old one
        config = json.loads(json.dumps(compose.conf))
--- a/pungi/phases/gather/init.py
+++ b/pungi/phases/gather/init.py
@ -90,7 +90,7 @@ class GatherPhase(PhaseBase):

        # check whether variants from configuration value
        # 'variant_as_lookaside' are correct
-        for (requiring, required) in variant_as_lookaside:
+        for requiring, required in variant_as_lookaside:
            if requiring in all_variants and required not in all_variants:
                errors.append(
                    "variant_as_lookaside: variant %r doesn't exist but is "
@ -99,7 +99,7 @@ class GatherPhase(PhaseBase):

        # check whether variants from configuration value
        # 'variant_as_lookaside' have same architectures
-        for (requiring, required) in variant_as_lookaside:
+        for requiring, required in variant_as_lookaside:
            if (
                requiring in all_variants
                and required in all_variants
@ -235,7 +235,7 @@ def reuse_old_gather_packages(compose, arch, variant, package_sets, methods):
    if not hasattr(compose, "_gather_reused_variant_arch"):
        setattr(compose, "_gather_reused_variant_arch", [])
    variant_as_lookaside = compose.conf.get("variant_as_lookaside", [])
-    for (requiring, required) in variant_as_lookaside:
+    for requiring, required in variant_as_lookaside:
        if (
            requiring == variant.uid
            and (required, arch) not in compose._gather_reused_variant_arch
@ -468,9 +468,7 @@ def gather_packages(compose, arch, variant, package_sets, fulltree_excludes=None
        )

    else:
-
        for source_name in ("module", "comps", "json"):
-
            packages, groups, filter_packages = get_variant_packages(
                compose, arch, variant, source_name, package_sets
            )
@ -575,7 +573,6 @@ def trim_packages(compose, arch, variant, pkg_map, parent_pkgs=None, remove_pkgs
    move_to_parent_pkgs = _mk_pkg_map()
    removed_pkgs = _mk_pkg_map()
    for pkg_type, pkgs in pkg_map.items():
-
        new_pkgs = []
        for pkg in pkgs:
            pkg_path = pkg["path"]
@ -647,9 +644,10 @@ def _make_lookaside_repo(compose, variant, arch, pkg_map, package_sets=None):
            compose.paths.work.topdir(arch="global"), "download"
        )
        + "/",
-        "koji": lambda: pungi.wrappers.kojiwrapper.KojiWrapper(
-            compose
-        ).koji_module.config.topdir.rstrip("/")
+        "koji": lambda: compose.conf.get(
+            "koji_cache",
+            pungi.wrappers.kojiwrapper.KojiWrapper(compose).koji_module.config.topdir,
+        ).rstrip("/")
        + "/",
    }
    path_prefix = prefixes[compose.conf["pkgset_source"]]()
@ -662,6 +660,11 @@ def _make_lookaside_repo(compose, variant, arch, pkg_map, package_sets=None):
                # we need a union of all SRPMs.
                if pkg_type == "srpm" or pkg_arch == arch:
                    for pkg in packages:
+                        if "lookaside" in pkg.get("flags", []):
+                            # We want to ignore lookaside packages, those will
+                            # be visible to the depending variants from the
+                            # lookaside repo directly.
+                            continue
                        pkg = pkg["path"]
                        if path_prefix and pkg.startswith(path_prefix):
                            pkg = pkg[len(path_prefix) :]
--- a/pungi/phases/gather/methods/method_hybrid.py
+++ b/pungi/phases/gather/methods/method_hybrid.py
@ -47,9 +47,15 @@ class FakePackage(object):

    @property
    def files(self):
-        return [
-            os.path.join(dirname, basename) for (_, dirname, basename) in self.pkg.files
-        ]
+        paths = []
+        # createrepo_c.Package.files is a tuple, but its length differs across
+        # versions. The constants define index at which the related value is
+        # located.
+        for entry in self.pkg.files:
+            paths.append(
+                os.path.join(entry[cr.FILE_ENTRY_PATH], entry[cr.FILE_ENTRY_NAME])
+            )
+        return paths

    @property
    def provides(self):
--- a/pungi/phases/image_build.py
+++ b/pungi/phases/image_build.py
@ -25,6 +25,7 @@ from productmd.rpms import Rpms
 # results will be pulled into the compose.
 EXTENSIONS = {
    "docker": ["tar.gz", "tar.xz"],
+    "iso": ["iso"],
    "liveimg-squashfs": ["liveimg.squashfs"],
    "qcow": ["qcow"],
    "qcow2": ["qcow2"],
@ -39,6 +40,7 @@ EXTENSIONS = {
    "vdi": ["vdi"],
    "vmdk": ["vmdk"],
    "vpc": ["vhd"],
+    "vhd-compressed": ["vhd.gz", "vhd.xz"],
    "vsphere-ova": ["vsphere.ova"],
 }

@ -344,7 +346,9 @@ class CreateImageBuildThread(WorkerThread):
            # let's not change filename of koji outputs
            image_dest = os.path.join(image_dir, os.path.basename(image_info["path"]))

-            src_file = os.path.realpath(image_info["path"])
+            src_file = compose.koji_downloader.get_file(
+                os.path.realpath(image_info["path"])
+            )
            linker.link(src_file, image_dest, link_type=cmd["link_type"])

            # Update image manifest
--- a/pungi/phases/image_container.py
+++ b/pungi/phases/image_container.py
@ -76,7 +76,7 @@ class ImageContainerThread(WorkerThread):
        )
        if koji.watch_task(task_id, log_file) != 0:
            raise RuntimeError(
-                "ImageContainer: task %s failed: see %s for details"
+                "ImageContainer task failed: %s. See %s for details"
                % (task_id, log_file)
            )

--- a/pungi/phases/kiwibuild.py
+++ b/pungi/phases/kiwibuild.py
@ -0,0 +1,229 @@
+# -*- coding: utf-8 -*-
+
+import os
+from kobo.threads import ThreadPool, WorkerThread
+from kobo import shortcuts
+from productmd.images import Image
+
+from . import base
+from .. import util
+from ..linker import Linker
+from ..wrappers import kojiwrapper
+from .image_build import EXTENSIONS
+
+KIWIEXTENSIONS = [
+    ("vhd-compressed", ["vhdfixed.xz"], "vhd.xz"),
+    ("vagrant-libvirt", ["vagrant.libvirt.box"], "vagrant-libvirt.box"),
+    ("vagrant-virtualbox", ["vagrant.virtualbox.box"], "vagrant-virtualbox.box"),
+]
+
+
+class KiwiBuildPhase(
+    base.PhaseLoggerMixin, base.ImageConfigMixin, base.ConfigGuardedPhase
+):
+    name = "kiwibuild"
+
+    def __init__(self, compose):
+        super(KiwiBuildPhase, self).__init__(compose)
+        self.pool = ThreadPool(logger=self.logger)
+
+    def _get_arches(self, image_conf, arches):
+        """Get an intersection of arches in the config dict and the given ones."""
+        if "arches" in image_conf:
+            arches = set(image_conf["arches"]) & arches
+        return sorted(arches)
+
+    @staticmethod
+    def _get_repo_urls(compose, repos, arch="$basearch"):
+        """
+        Get list of repos with resolved repo URLs. Preserve repos defined
+        as dicts.
+        """
+        resolved_repos = []
+
+        for repo in repos:
+            repo = util.get_repo_url(compose, repo, arch=arch)
+            if repo is None:
+                raise RuntimeError("Failed to resolve repo URL for %s" % repo)
+            resolved_repos.append(repo)
+
+        return resolved_repos
+
+    def _get_repo(self, image_conf, variant):
+        """
+        Get a list of repos. First included are those explicitly listed in
+        config, followed by by repo for current variant if it's not included in
+        the list already.
+        """
+        repos = shortcuts.force_list(image_conf.get("repos", []))
+
+        if not variant.is_empty and variant.uid not in repos:
+            repos.append(variant.uid)
+
+        return KiwiBuildPhase._get_repo_urls(self.compose, repos, arch="$arch")
+
+    def run(self):
+        for variant in self.compose.get_variants():
+            arches = set([x for x in variant.arches if x != "src"])
+
+            for image_conf in self.get_config_block(variant):
+                build_arches = self._get_arches(image_conf, arches)
+                if not build_arches:
+                    self.log_debug("skip: no arches")
+                    continue
+
+                # these properties can be set per-image *or* as e.g.
+                # kiwibuild_description_scm or global_release in the config
+                generics = {
+                    "release": self.get_release(image_conf),
+                    "target": self.get_config(image_conf, "target"),
+                    "descscm": self.get_config(image_conf, "description_scm"),
+                    "descpath": self.get_config(image_conf, "description_path"),
+                    "type": self.get_config(image_conf, "type"),
+                    "type_attr": self.get_config(image_conf, "type_attr"),
+                    "bundle_name_format": self.get_config(
+                        image_conf, "bundle_name_format"
+                    ),
+                }
+
+                repo = self._get_repo(image_conf, variant)
+
+                failable_arches = image_conf.pop("failable", [])
+                if failable_arches == ["*"]:
+                    failable_arches = image_conf["arches"]
+
+                self.pool.add(RunKiwiBuildThread(self.pool))
+                self.pool.queue_put(
+                    (
+                        self.compose,
+                        variant,
+                        image_conf,
+                        build_arches,
+                        generics,
+                        repo,
+                        failable_arches,
+                    )
+                )
+
+        self.pool.start()
+
+
+class RunKiwiBuildThread(WorkerThread):
+    def process(self, item, num):
+        (compose, variant, config, arches, generics, repo, failable_arches) = item
+        self.failable_arches = failable_arches
+        # the Koji task as a whole can only fail if *all* arches are failable
+        can_task_fail = set(failable_arches).issuperset(set(arches))
+        self.num = num
+        with util.failable(
+            compose,
+            can_task_fail,
+            variant,
+            "*",
+            "kiwibuild",
+            logger=self.pool._logger,
+        ):
+            self.worker(compose, variant, config, arches, generics, repo)
+
+    def worker(self, compose, variant, config, arches, generics, repo):
+        msg = "kiwibuild task for variant %s" % variant.uid
+        self.pool.log_info("[BEGIN] %s" % msg)
+        koji = kojiwrapper.KojiWrapper(compose)
+        koji.login()
+
+        task_id = koji.koji_proxy.kiwiBuild(
+            generics["target"],
+            arches,
+            generics["descscm"],
+            generics["descpath"],
+            profile=config["kiwi_profile"],
+            release=generics["release"],
+            repos=repo,
+            type=generics["type"],
+            type_attr=generics["type_attr"],
+            result_bundle_name_format=generics["bundle_name_format"],
+            # this ensures the task won't fail if only failable arches fail
+            optional_arches=self.failable_arches,
+        )
+
+        koji.save_task_id(task_id)
+
+        # Wait for it to finish and capture the output into log file.
+        log_dir = os.path.join(compose.paths.log.topdir(), "kiwibuild")
+        util.makedirs(log_dir)
+        log_file = os.path.join(
+            log_dir, "%s-%s-watch-task.log" % (variant.uid, self.num)
+        )
+        if koji.watch_task(task_id, log_file) != 0:
+            raise RuntimeError(
+                "kiwiBuild task failed: %s. See %s for details" % (task_id, log_file)
+            )
+
+        # Refresh koji session which may have timed out while the task was
+        # running. Watching is done via a subprocess, so the session is
+        # inactive.
+        koji = kojiwrapper.KojiWrapper(compose)
+
+        linker = Linker(logger=self.pool._logger)
+
+        # Process all images in the build. There should be one for each
+        # architecture, but we don't verify that.
+        paths = koji.get_image_paths(task_id)
+
+        for arch, paths in paths.items():
+            for path in paths:
+                type_, format_ = _find_type_and_format(path)
+                if not format_:
+                    # Path doesn't match any known type.
+                    continue
+
+                # image_dir is absolute path to which the image should be copied.
+                # We also need the same path as relative to compose directory for
+                # including in the metadata.
+                image_dir = compose.paths.compose.image_dir(variant) % {"arch": arch}
+                rel_image_dir = compose.paths.compose.image_dir(
+                    variant, relative=True
+                ) % {"arch": arch}
+                util.makedirs(image_dir)
+
+                filename = os.path.basename(path)
+
+                image_dest = os.path.join(image_dir, filename)
+
+                src_file = compose.koji_downloader.get_file(path)
+
+                linker.link(src_file, image_dest, link_type=compose.conf["link_type"])
+
+                # Update image manifest
+                img = Image(compose.im)
+
+                # Get the manifest type from the config if supplied, otherwise we
+                # determine the manifest type based on the koji output
+                img.type = type_
+                img.format = format_
+                img.path = os.path.join(rel_image_dir, filename)
+                img.mtime = util.get_mtime(image_dest)
+                img.size = util.get_file_size(image_dest)
+                img.arch = arch
+                img.disc_number = 1  # We don't expect multiple disks
+                img.disc_count = 1
+                img.bootable = False
+                img.subvariant = config.get("subvariant", variant.uid)
+                setattr(img, "can_fail", arch in self.failable_arches)
+                setattr(img, "deliverable", "kiwibuild")
+                compose.im.add(variant=variant.uid, arch=arch, image=img)
+
+        self.pool.log_info("[DONE ] %s (task id: %s)" % (msg, task_id))
+
+
+def _find_type_and_format(path):
+    for type_, suffixes in EXTENSIONS.items():
+        for suffix in suffixes:
+            if path.endswith(suffix):
+                return type_, suffix
+    # these are our kiwi-exclusive mappings for images whose extensions
+    # aren't quite the same as imagefactory
+    for type_, suffixes, format_ in KIWIEXTENSIONS:
+        if any(path.endswith(suffix) for suffix in suffixes):
+            return type_, format_
+    return None, None
--- a/pungi/phases/live_images.py
+++ b/pungi/phases/live_images.py
@ -1,406 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <https://gnu.org/licenses/>.
-
-
-import os
-import sys
-import time
-import shutil
-
-from kobo.threads import ThreadPool, WorkerThread
-from kobo.shortcuts import run, save_to_file, force_list
-from productmd.images import Image
-from six.moves import shlex_quote
-
-from pungi.wrappers.kojiwrapper import KojiWrapper
-from pungi.wrappers import iso
-from pungi.phases import base
-from pungi.util import makedirs, get_mtime, get_file_size, failable
-from pungi.util import get_repo_urls
-
-
-# HACK: define cmp in python3
-if sys.version_info[0] == 3:
-
-    def cmp(a, b):
-        return (a > b) - (a < b)
-
-
-class LiveImagesPhase(
-    base.PhaseLoggerMixin, base.ImageConfigMixin, base.ConfigGuardedPhase
-):
-    name = "live_images"
-
-    def __init__(self, compose):
-        super(LiveImagesPhase, self).__init__(compose)
-        self.pool = ThreadPool(logger=self.logger)
-
-    def _get_repos(self, arch, variant, data):
-        repos = []
-        if not variant.is_empty:
-            repos.append(variant.uid)
-        repos.extend(force_list(data.get("repo", [])))
-        return get_repo_urls(self.compose, repos, arch=arch)
-
-    def run(self):
-        symlink_isos_to = self.compose.conf.get("symlink_isos_to")
-        commands = []
-
-        for variant in self.compose.all_variants.values():
-            for arch in variant.arches + ["src"]:
-                for data in self.get_config_block(variant, arch):
-                    subvariant = data.get("subvariant", variant.uid)
-                    type = data.get("type", "live")
-
-                    if type == "live":
-                        dest_dir = self.compose.paths.compose.iso_dir(
-                            arch, variant, symlink_to=symlink_isos_to
-                        )
-                    elif type == "appliance":
-                        dest_dir = self.compose.paths.compose.image_dir(
-                            variant, symlink_to=symlink_isos_to
-                        )
-                        dest_dir = dest_dir % {"arch": arch}
-                        makedirs(dest_dir)
-                    else:
-                        raise RuntimeError("Unknown live image type %s" % type)
-                    if not dest_dir:
-                        continue
-
-                    cmd = {
-                        "name": data.get("name"),
-                        "version": self.get_version(data),
-                        "release": self.get_release(data),
-                        "dest_dir": dest_dir,
-                        "build_arch": arch,
-                        "ks_file": data["kickstart"],
-                        "ksurl": self.get_ksurl(data),
-                        # Used for images wrapped in RPM
-                        "specfile": data.get("specfile", None),
-                        # Scratch (only taken in consideration if specfile
-                        # specified) For images wrapped in rpm is scratch
-                        # disabled by default For other images is scratch
-                        # always on
-                        "scratch": data.get("scratch", False),
-                        "sign": False,
-                        "type": type,
-                        "label": "",  # currently not used
-                        "subvariant": subvariant,
-                        "failable_arches": data.get("failable", []),
-                        # First see if live_target is specified, then fall back
-                        # to regular setup of local, phase and global setting.
-                        "target": self.compose.conf.get("live_target")
-                        or self.get_config(data, "target"),
-                    }
-
-                    cmd["repos"] = self._get_repos(arch, variant, data)
-
-                    # Signing of the rpm wrapped image
-                    if not cmd["scratch"] and data.get("sign"):
-                        cmd["sign"] = True
-
-                    cmd["filename"] = self._get_file_name(
-                        arch, variant, cmd["name"], cmd["version"]
-                    )
-
-                    commands.append((cmd, variant, arch))
-
-        for (cmd, variant, arch) in commands:
-            self.pool.add(CreateLiveImageThread(self.pool))
-            self.pool.queue_put((self.compose, cmd, variant, arch))
-
-        self.pool.start()
-
-    def _get_file_name(self, arch, variant, name=None, version=None):
-        if self.compose.conf["live_images_no_rename"]:
-            return None
-
-        disc_type = self.compose.conf["disc_types"].get("live", "live")
-
-        format = (
-            "%(compose_id)s-%(variant)s-%(arch)s-%(disc_type)s%(disc_num)s%(suffix)s"
-        )
-        # Custom name (prefix)
-        if name:
-            custom_iso_name = name
-            if version:
-                custom_iso_name += "-%s" % version
-            format = (
-                custom_iso_name
-                + "-%(variant)s-%(arch)s-%(disc_type)s%(disc_num)s%(suffix)s"
-            )
-
-        # XXX: hardcoded disc_num
-        return self.compose.get_image_name(
-            arch, variant, disc_type=disc_type, disc_num=None, format=format
-        )
-
-
-class CreateLiveImageThread(WorkerThread):
-    EXTS = (".iso", ".raw.xz")
-
-    def process(self, item, num):
-        compose, cmd, variant, arch = item
-        self.failable_arches = cmd.get("failable_arches", [])
-        self.can_fail = bool(self.failable_arches)
-        with failable(
-            compose,
-            self.can_fail,
-            variant,
-            arch,
-            "live",
-            cmd.get("subvariant"),
-            logger=self.pool._logger,
-        ):
-            self.worker(compose, cmd, variant, arch, num)
-
-    def worker(self, compose, cmd, variant, arch, num):
-        self.basename = "%(name)s-%(version)s-%(release)s" % cmd
-        log_file = compose.paths.log.log_file(arch, "liveimage-%s" % self.basename)
-
-        subvariant = cmd.pop("subvariant")
-
-        imgname = "%s-%s-%s-%s" % (
-            compose.ci_base.release.short,
-            subvariant,
-            "Live" if cmd["type"] == "live" else "Disk",
-            arch,
-        )
-
-        msg = "Creating ISO (arch: %s, variant: %s): %s" % (
-            arch,
-            variant,
-            self.basename,
-        )
-        self.pool.log_info("[BEGIN] %s" % msg)
-
-        koji_wrapper = KojiWrapper(compose)
-        _, version = compose.compose_id.rsplit("-", 1)
-        name = cmd["name"] or imgname
-        version = cmd["version"] or version
-        archive = False
-        if cmd["specfile"] and not cmd["scratch"]:
-            # Non scratch build are allowed only for rpm wrapped images
-            archive = True
-        koji_cmd = koji_wrapper.get_create_image_cmd(
-            name,
-            version,
-            cmd["target"],
-            cmd["build_arch"],
-            cmd["ks_file"],
-            cmd["repos"],
-            image_type=cmd["type"],
-            wait=True,
-            archive=archive,
-            specfile=cmd["specfile"],
-            release=cmd["release"],
-            ksurl=cmd["ksurl"],
-        )
-
-        # avoid race conditions?
-        # Kerberos authentication failed:
-        #   Permission denied in replay cache code (-1765328215)
-        time.sleep(num * 3)
-
-        output = koji_wrapper.run_blocking_cmd(koji_cmd, log_file=log_file)
-        if output["retcode"] != 0:
-            raise RuntimeError(
-                "LiveImage task failed: %s. See %s for more details."
-                % (output["task_id"], log_file)
-            )
-
-        # copy finished image to isos/
-        image_path = [
-            path
-            for path in koji_wrapper.get_image_path(output["task_id"])
-            if self._is_image(path)
-        ]
-        if len(image_path) != 1:
-            raise RuntimeError(
-                "Got %d images from task %d, expected 1."
-                % (len(image_path), output["task_id"])
-            )
-        image_path = image_path[0]
-        filename = cmd.get("filename") or os.path.basename(image_path)
-        destination = os.path.join(cmd["dest_dir"], filename)
-        shutil.copy2(image_path, destination)
-
-        # copy finished rpm to isos/ (if rpm wrapped ISO was built)
-        if cmd["specfile"]:
-            rpm_paths = koji_wrapper.get_wrapped_rpm_path(output["task_id"])
-
-            if cmd["sign"]:
-                # Sign the rpm wrapped images and get their paths
-                self.pool.log_info(
-                    "Signing rpm wrapped images in task_id: %s (expected key ID: %s)"
-                    % (output["task_id"], compose.conf.get("signing_key_id"))
-                )
-                signed_rpm_paths = self._sign_image(
-                    koji_wrapper, compose, cmd, output["task_id"]
-                )
-                if signed_rpm_paths:
-                    rpm_paths = signed_rpm_paths
-
-            for rpm_path in rpm_paths:
-                shutil.copy2(rpm_path, cmd["dest_dir"])
-
-        if cmd["type"] == "live":
-            # ISO manifest only makes sense for live images
-            self._write_manifest(destination)
-
-        self._add_to_images(
-            compose,
-            variant,
-            subvariant,
-            arch,
-            cmd["type"],
-            self._get_format(image_path),
-            destination,
-        )
-
-        self.pool.log_info("[DONE ] %s (task id: %s)" % (msg, output["task_id"]))
-
-    def _add_to_images(self, compose, variant, subvariant, arch, type, format, path):
-        """Adds the image to images.json"""
-        img = Image(compose.im)
-        img.type = "raw-xz" if type == "appliance" else type
-        img.format = format
-        img.path = os.path.relpath(path, compose.paths.compose.topdir())
-        img.mtime = get_mtime(path)
-        img.size = get_file_size(path)
-        img.arch = arch
-        img.disc_number = 1  # We don't expect multiple disks
-        img.disc_count = 1
-        img.bootable = True
-        img.subvariant = subvariant
-        setattr(img, "can_fail", self.can_fail)
-        setattr(img, "deliverable", "live")
-        compose.im.add(variant=variant.uid, arch=arch, image=img)
-
-    def _is_image(self, path):
-        for ext in self.EXTS:
-            if path.endswith(ext):
-                return True
-        return False
-
-    def _get_format(self, path):
-        """Get format based on extension."""
-        for ext in self.EXTS:
-            if path.endswith(ext):
-                return ext[1:]
-        raise RuntimeError("Getting format for unknown image %s" % path)
-
-    def _write_manifest(self, iso_path):
-        """Generate manifest for ISO at given path.
-
-        :param iso_path: (str) absolute path to the ISO
-        """
-        dir, filename = os.path.split(iso_path)
-        run("cd %s && %s" % (shlex_quote(dir), iso.get_manifest_cmd(filename)))
-
-    def _sign_image(self, koji_wrapper, compose, cmd, koji_task_id):
-        signing_key_id = compose.conf.get("signing_key_id")
-        signing_command = compose.conf.get("signing_command")
-
-        if not signing_key_id:
-            self.pool.log_warning(
-                "Signing is enabled but signing_key_id is not specified"
-            )
-            self.pool.log_warning("Signing skipped")
-            return None
-        if not signing_command:
-            self.pool.log_warning(
-                "Signing is enabled but signing_command is not specified"
-            )
-            self.pool.log_warning("Signing skipped")
-            return None
-
-        # Prepare signing log file
-        signing_log_file = compose.paths.log.log_file(
-            cmd["build_arch"], "live_images-signing-%s" % self.basename
-        )
-
-        # Sign the rpm wrapped images
-        try:
-            sign_builds_in_task(
-                koji_wrapper,
-                koji_task_id,
-                signing_command,
-                log_file=signing_log_file,
-                signing_key_password=compose.conf.get("signing_key_password"),
-            )
-        except RuntimeError:
-            self.pool.log_error(
-                "Error while signing rpm wrapped images. See log: %s" % signing_log_file
-            )
-            raise
-
-        # Get pats to the signed rpms
-        signing_key_id = signing_key_id.lower()  # Koji uses lowercase in paths
-        rpm_paths = koji_wrapper.get_signed_wrapped_rpms_paths(
-            koji_task_id, signing_key_id
-        )
-
-        # Wait until files are available
-        if wait_paths(rpm_paths, 60 * 15):
-            # Files are ready
-            return rpm_paths
-
-        # Signed RPMs are not available
-        self.pool.log_warning("Signed files are not available: %s" % rpm_paths)
-        self.pool.log_warning("Unsigned files will be used")
-        return None
-
-
-def wait_paths(paths, timeout=60):
-    started = time.time()
-    remaining = paths[:]
-    while True:
-        for path in remaining[:]:
-            if os.path.exists(path):
-                remaining.remove(path)
-        if not remaining:
-            break
-        time.sleep(1)
-        if timeout >= 0 and (time.time() - started) > timeout:
-            return False
-    return True
-
-
-def sign_builds_in_task(
-    koji_wrapper, task_id, signing_command, log_file=None, signing_key_password=None
-):
-    # Get list of nvrs that should be signed
-    nvrs = koji_wrapper.get_build_nvrs(task_id)
-    if not nvrs:
-        # No builds are available (scratch build, etc.?)
-        return
-
-    # Append builds to sign_cmd
-    for nvr in nvrs:
-        signing_command += " '%s'" % nvr
-
-    # Log signing command before password is filled in it
-    if log_file:
-        save_to_file(log_file, signing_command, append=True)
-
-    # Fill password into the signing command
-    if signing_key_password:
-        signing_command = signing_command % {
-            "signing_key_password": signing_key_password
-        }
-
-    # Sign the builds
-    run(signing_command, can_fail=False, show_cmd=False, logfile=log_file)
--- a/pungi/phases/livemedia_phase.py
+++ b/pungi/phases/livemedia_phase.py
@ -182,7 +182,9 @@ class LiveMediaThread(WorkerThread):
            # let's not change filename of koji outputs
            image_dest = os.path.join(image_dir, os.path.basename(image_info["path"]))

-            src_file = os.path.realpath(image_info["path"])
+            src_file = compose.koji_downloader.get_file(
+                os.path.realpath(image_info["path"])
+            )
            linker.link(src_file, image_dest, link_type=link_type)

            # Update image manifest
--- a/pungi/phases/osbs.py
+++ b/pungi/phases/osbs.py
@ -134,7 +134,7 @@ class OSBSThread(WorkerThread):
        # though there is not much there).
        if koji.watch_task(task_id, log_file) != 0:
            raise RuntimeError(
-                "OSBS: task %s failed: see %s for details" % (task_id, log_file)
+                "OSBS task failed: %s. See %s for details" % (task_id, log_file)
            )

        scratch = config.get("scratch", False)
@ -154,7 +154,7 @@ class OSBSThread(WorkerThread):
            reuse_file,
        )

-        self.pool.log_info("[DONE ] %s" % msg)
+        self.pool.log_info("[DONE ] %s (task id: %s)" % (msg, task_id))

    def _get_image_conf(self, compose, config):
        """Get image-build.conf from git repo.
--- a/pungi/phases/osbuild.py
+++ b/pungi/phases/osbuild.py
@ -27,6 +27,35 @@ class OSBuildPhase(
            arches = set(image_conf["arches"]) & arches
        return sorted(arches)

+    @staticmethod
+    def _get_repo_urls(compose, repos, arch="$basearch"):
+        """
+        Get list of repos with resolved repo URLs. Preserve repos defined
+        as dicts.
+        """
+        resolved_repos = []
+
+        for repo in repos:
+            if isinstance(repo, dict):
+                try:
+                    url = repo["baseurl"]
+                except KeyError:
+                    raise RuntimeError(
+                        "`baseurl` is required in repo dict %s" % str(repo)
+                    )
+                url = util.get_repo_url(compose, url, arch=arch)
+                if url is None:
+                    raise RuntimeError("Failed to resolve repo URL for %s" % str(repo))
+                repo["baseurl"] = url
+                resolved_repos.append(repo)
+            else:
+                repo = util.get_repo_url(compose, repo, arch=arch)
+                if repo is None:
+                    raise RuntimeError("Failed to resolve repo URL for %s" % repo)
+                resolved_repos.append(repo)
+
+        return resolved_repos
+
    def _get_repo(self, image_conf, variant):
        """
        Get a list of repos. First included are those explicitly listed in
@ -38,7 +67,7 @@ class OSBuildPhase(
        if not variant.is_empty and variant.uid not in repos:
            repos.append(variant.uid)

-        return util.get_repo_urls(self.compose, repos, arch="$arch")
+        return OSBuildPhase._get_repo_urls(self.compose, repos, arch="$arch")

    def run(self):
        for variant in self.compose.get_variants():
@ -130,6 +159,10 @@ class RunOSBuildThread(WorkerThread):
        if upload_options:
            opts["upload_options"] = upload_options

+        customizations = config.get("customizations")
+        if customizations:
+            opts["customizations"] = customizations
+
        if release:
            opts["release"] = release
        task_id = koji.koji_proxy.osbuildImage(
@ -152,7 +185,7 @@ class RunOSBuildThread(WorkerThread):
        )
        if koji.watch_task(task_id, log_file) != 0:
            raise RuntimeError(
-                "OSBuild: task %s failed: see %s for details" % (task_id, log_file)
+                "OSBuild task failed: %s. See %s for details" % (task_id, log_file)
            )

        # Refresh koji session which may have timed out while the task was
@ -183,16 +216,27 @@ class RunOSBuildThread(WorkerThread):
            # image_dir is absolute path to which the image should be copied.
            # We also need the same path as relative to compose directory for
            # including in the metadata.
-            image_dir = compose.paths.compose.image_dir(variant) % {"arch": arch}
-            rel_image_dir = compose.paths.compose.image_dir(variant, relative=True) % {
-                "arch": arch
-            }
+            if archive["type_name"] == "iso":
+                # If the produced image is actually an ISO, it should go to
+                # iso/ subdirectory.
+                image_dir = compose.paths.compose.iso_dir(arch, variant)
+                rel_image_dir = compose.paths.compose.iso_dir(
+                    arch, variant, relative=True
+                )
+            else:
+                image_dir = compose.paths.compose.image_dir(variant) % {"arch": arch}
+                rel_image_dir = compose.paths.compose.image_dir(
+                    variant, relative=True
+                ) % {"arch": arch}
            util.makedirs(image_dir)

            image_dest = os.path.join(image_dir, archive["filename"])

-            src_file = os.path.join(
-                koji.koji_module.pathinfo.imagebuild(build_info), archive["filename"]
+            src_file = compose.koji_downloader.get_file(
+                os.path.join(
+                    koji.koji_module.pathinfo.imagebuild(build_info),
+                    archive["filename"],
+                ),
            )

            linker.link(src_file, image_dest, link_type=compose.conf["link_type"])
@ -209,7 +253,24 @@ class RunOSBuildThread(WorkerThread):

            # Update image manifest
            img = Image(compose.im)
-            img.type = archive["type_name"]
+
+            # Get the manifest type from the config if supplied, otherwise we
+            # determine the manifest type based on the koji output
+            img.type = config.get("manifest_type")
+            if not img.type:
+                if archive["type_name"] != "iso":
+                    img.type = archive["type_name"]
+                else:
+                    fn = archive["filename"].lower()
+                    if "ostree" in fn:
+                        img.type = "dvd-ostree-osbuild"
+                    elif "live" in fn:
+                        img.type = "live-osbuild"
+                    elif "netinst" in fn or "boot" in fn:
+                        img.type = "boot"
+                    else:
+                        img.type = "dvd"
+
            img.format = suffix
            img.path = os.path.join(rel_image_dir, archive["filename"])
            img.mtime = util.get_mtime(image_dest)
--- a/pungi/phases/ostree.py
+++ b/pungi/phases/ostree.py
@ -85,7 +85,7 @@ class OSTreeThread(WorkerThread):
        comps_repo = compose.paths.work.comps_repo(
            "$basearch", variant=variant, create_dir=False
        )
-        repos = shortcuts.force_list(config["repo"]) + self.repos
+        repos = shortcuts.force_list(config.get("repo", [])) + self.repos
        if compose.has_comps:
            repos.append(translate_path(compose, comps_repo))
        repos = get_repo_dicts(repos, logger=self.pool)
@ -168,7 +168,9 @@ class OSTreeThread(WorkerThread):
                ("unified-core", config.get("unified_core", False)),
            ]
        )
-        packages = ["pungi", "ostree", "rpm-ostree"]
+        default_packages = ["pungi", "ostree", "rpm-ostree"]
+        additional_packages = config.get("runroot_packages", [])
+        packages = default_packages + additional_packages
        log_file = os.path.join(self.logdir, "runroot.log")
        mounts = [compose.topdir, config["ostree_repo"]]
        runroot = Runroot(compose, phase="ostree")
--- a/pungi/phases/ostree_container.py
+++ b/pungi/phases/ostree_container.py
@ -0,0 +1,190 @@
+# -*- coding: utf-8 -*-
+
+import copy
+import json
+import os
+from kobo import shortcuts
+from kobo.threads import ThreadPool, WorkerThread
+
+from productmd.images import Image
+
+from pungi.runroot import Runroot
+from .base import ConfigGuardedPhase
+from .. import util
+from ..util import get_repo_dicts, translate_path
+from ..wrappers import scm
+
+
+class OSTreeContainerPhase(ConfigGuardedPhase):
+    name = "ostree_container"
+
+    def __init__(self, compose, pkgset_phase=None):
+        super(OSTreeContainerPhase, self).__init__(compose)
+        self.pool = ThreadPool(logger=self.compose._logger)
+        self.pkgset_phase = pkgset_phase
+
+    def get_repos(self):
+        return [
+            translate_path(
+                self.compose,
+                self.compose.paths.work.pkgset_repo(
+                    pkgset.name, "$basearch", create_dir=False
+                ),
+            )
+            for pkgset in self.pkgset_phase.package_sets
+        ]
+
+    def _enqueue(self, variant, arch, conf):
+        self.pool.add(OSTreeContainerThread(self.pool, self.get_repos()))
+        self.pool.queue_put((self.compose, variant, arch, conf))
+
+    def run(self):
+        if isinstance(self.compose.conf.get(self.name), dict):
+            for variant in self.compose.get_variants():
+                for conf in self.get_config_block(variant):
+                    for arch in conf.get("arches", []) or variant.arches:
+                        self._enqueue(variant, arch, conf)
+        else:
+            # Legacy code path to support original configuration.
+            for variant in self.compose.get_variants():
+                for arch in variant.arches:
+                    for conf in self.get_config_block(variant, arch):
+                        self._enqueue(variant, arch, conf)
+
+        self.pool.start()
+
+
+class OSTreeContainerThread(WorkerThread):
+    def __init__(self, pool, repos):
+        super(OSTreeContainerThread, self).__init__(pool)
+        self.repos = repos
+
+    def process(self, item, num):
+        compose, variant, arch, config = item
+        self.num = num
+        failable_arches = config.get("failable", [])
+        self.can_fail = util.can_arch_fail(failable_arches, arch)
+        with util.failable(compose, self.can_fail, variant, arch, "ostree-container"):
+            self.worker(compose, variant, arch, config)
+
+    def worker(self, compose, variant, arch, config):
+        msg = "OSTree container phase for variant %s, arch %s" % (variant.uid, arch)
+        self.pool.log_info("[BEGIN] %s" % msg)
+        workdir = compose.paths.work.topdir("ostree-container-%d" % self.num)
+        self.logdir = compose.paths.log.topdir(
+            "%s/%s/ostree-container-%d" % (arch, variant.uid, self.num)
+        )
+        repodir = os.path.join(workdir, "config_repo")
+        self._clone_repo(
+            compose,
+            repodir,
+            config["config_url"],
+            config.get("config_branch", "main"),
+        )
+
+        repos = shortcuts.force_list(config.get("repo", [])) + self.repos
+        repos = get_repo_dicts(repos, logger=self.pool)
+
+        # copy the original config and update before save to a json file
+        new_config = copy.copy(config)
+
+        # repos in configuration can have repo url set to variant UID,
+        # update it to have the actual url that we just translated.
+        new_config.update({"repo": repos})
+
+        # remove unnecessary (for 'pungi-make-ostree container' script ) elements
+        # from config, it doesn't hurt to have them, however remove them can
+        # reduce confusion
+        for k in [
+            "treefile",
+            "config_url",
+            "config_branch",
+            "failable",
+            "version",
+        ]:
+            new_config.pop(k, None)
+
+        # write a json file to save the configuration, so 'pungi-make-ostree tree'
+        # can take use of it
+        extra_config_file = os.path.join(workdir, "extra_config.json")
+        with open(extra_config_file, "w") as f:
+            json.dump(new_config, f, indent=4)
+
+        self._run_ostree_container_cmd(
+            compose, variant, arch, config, repodir, extra_config_file=extra_config_file
+        )
+
+        self.pool.log_info("[DONE ] %s" % (msg))
+
+    def _run_ostree_container_cmd(
+        self, compose, variant, arch, config, config_repo, extra_config_file=None
+    ):
+        target_dir = compose.paths.compose.image_dir(variant) % {"arch": arch}
+        util.makedirs(target_dir)
+        version = util.version_generator(compose, config.get("version"))
+        archive_name = "%s-%s-%s" % (
+            compose.conf["release_short"],
+            variant.uid,
+            version,
+        )
+
+        # Run the pungi-make-ostree command locally to create a script to
+        # execute in runroot environment.
+        cmd = [
+            "pungi-make-ostree",
+            "container",
+            "--log-dir=%s" % self.logdir,
+            "--name=%s" % archive_name,
+            "--path=%s" % target_dir,
+            "--treefile=%s" % os.path.join(config_repo, config["treefile"]),
+            "--extra-config=%s" % extra_config_file,
+            "--version=%s" % version,
+        ]
+
+        _, runroot_script = shortcuts.run(cmd, universal_newlines=True)
+
+        default_packages = ["ostree", "rpm-ostree", "selinux-policy-targeted"]
+        additional_packages = config.get("runroot_packages", [])
+        packages = default_packages + additional_packages
+        log_file = os.path.join(self.logdir, "runroot.log")
+        # TODO: Use to get previous build
+        mounts = [compose.topdir]
+
+        runroot = Runroot(compose, phase="ostree_container")
+        runroot.run(
+            " && ".join(runroot_script.splitlines()),
+            log_file=log_file,
+            arch=arch,
+            packages=packages,
+            mounts=mounts,
+            new_chroot=True,
+            weight=compose.conf["runroot_weights"].get("ostree"),
+        )
+
+        fullpath = os.path.join(target_dir, "%s.ociarchive" % archive_name)
+
+        # Update image manifest
+        img = Image(compose.im)
+
+        # Get the manifest type from the config if supplied, otherwise we
+        # determine the manifest type based on the koji output
+        img.type = "ociarchive"
+        img.format = "ociarchive"
+        img.path = os.path.relpath(fullpath, compose.paths.compose.topdir())
+        img.mtime = util.get_mtime(fullpath)
+        img.size = util.get_file_size(fullpath)
+        img.arch = arch
+        img.disc_number = 1
+        img.disc_count = 1
+        img.bootable = False
+        img.subvariant = config.get("subvariant", variant.uid)
+        setattr(img, "can_fail", self.can_fail)
+        setattr(img, "deliverable", "ostree-container")
+        compose.im.add(variant=variant.uid, arch=arch, image=img)
+
+    def _clone_repo(self, compose, repodir, url, branch):
+        scm.get_dir_from_scm(
+            {"scm": "git", "repo": url, "branch": branch, "dir": "."},
+            repodir,
+            compose=compose,
+        )
--- a/pungi/phases/pkgset/common.py
+++ b/pungi/phases/pkgset/common.py
@ -38,12 +38,17 @@ from pungi.phases.createrepo import add_modular_metadata

 def populate_arch_pkgsets(compose, path_prefix, global_pkgset):
    result = {}
-    exclusive_noarch = compose.conf["pkgset_exclusive_arch_considers_noarch"]
+
    for arch in compose.get_arches():
        compose.log_info("Populating package set for arch: %s", arch)
        is_multilib = is_arch_multilib(compose.conf, arch)
        arches = get_valid_arches(arch, is_multilib, add_src=True)
-        pkgset = global_pkgset.subset(arch, arches, exclusive_noarch=exclusive_noarch)
+        pkgset = global_pkgset.subset(
+            arch,
+            arches,
+            exclusive_noarch=compose.conf["pkgset_exclusive_arch_considers_noarch"],
+            inherit_to_noarch=compose.conf["pkgset_inherit_exclusive_arch_to_noarch"],
+        )
        pkgset.save_file_list(
            compose.paths.work.package_list(arch=arch, pkgset=global_pkgset),
            remove_path_prefix=path_prefix,
--- a/pungi/phases/pkgset/pkgsets.py
+++ b/pungi/phases/pkgset/pkgsets.py
@ -24,10 +24,12 @@ import json
 import os
 import time
 from six.moves import cPickle as pickle
+from functools import partial

 import kobo.log
 import kobo.pkgset
 import kobo.rpmlib
+from kobo.shortcuts import compute_file_checksums

 from kobo.threads import WorkerThread, ThreadPool

@ -203,16 +205,31 @@ class PackageSetBase(kobo.log.LoggingBase):

        return self.rpms_by_arch

-    def subset(self, primary_arch, arch_list, exclusive_noarch=True):
+    def subset(
+        self, primary_arch, arch_list, exclusive_noarch=True, inherit_to_noarch=True
+    ):
        """Create a subset of this package set that only includes
        packages compatible with"""
        pkgset = PackageSetBase(
            self.name, self.sigkey_ordering, logger=self._logger, arches=arch_list
        )
-        pkgset.merge(self, primary_arch, arch_list, exclusive_noarch=exclusive_noarch)
+        pkgset.merge(
+            self,
+            primary_arch,
+            arch_list,
+            exclusive_noarch=exclusive_noarch,
+            inherit_to_noarch=inherit_to_noarch,
+        )
        return pkgset

-    def merge(self, other, primary_arch, arch_list, exclusive_noarch=True):
+    def merge(
+        self,
+        other,
+        primary_arch,
+        arch_list,
+        exclusive_noarch=True,
+        inherit_to_noarch=True,
+    ):
        """
        Merge ``other`` package set into this instance.
        """
@ -251,7 +268,7 @@ class PackageSetBase(kobo.log.LoggingBase):
                if i.file_path in self.file_cache:
                    # TODO: test if it really works
                    continue
-                if exclusivearch_list and arch == "noarch":
+                if inherit_to_noarch and exclusivearch_list and arch == "noarch":
                    if is_excluded(i, exclusivearch_list, logger=self._logger):
                        continue

@ -318,6 +335,11 @@ class FilelistPackageSet(PackageSetBase):
        return result


+# This is a marker to indicate package set with only extra builds/tasks and no
+# tasks.
+MISSING_KOJI_TAG = object()
+
+
 class KojiPackageSet(PackageSetBase):
    def __init__(
        self,
@ -334,6 +356,7 @@ class KojiPackageSet(PackageSetBase):
        extra_tasks=None,
        signed_packages_retries=0,
        signed_packages_wait=30,
+        downloader=None,
    ):
        """
        Creates new KojiPackageSet.
@ -371,7 +394,7 @@ class KojiPackageSet(PackageSetBase):
        :param int signed_packages_wait: How long to wait between search attemts.
        """
        super(KojiPackageSet, self).__init__(
-            name,
+            name if name != MISSING_KOJI_TAG else "no-tag",
            sigkey_ordering=sigkey_ordering,
            arches=arches,
            logger=logger,
@ -388,6 +411,8 @@ class KojiPackageSet(PackageSetBase):
        self.signed_packages_retries = signed_packages_retries
        self.signed_packages_wait = signed_packages_wait

+        self.downloader = downloader
+
    def __getstate__(self):
        result = self.__dict__.copy()
        del result["koji_wrapper"]
@ -506,11 +531,28 @@ class KojiPackageSet(PackageSetBase):
        # Check if this RPM is coming from scratch task. In this case, we already
        # know the path.
        if "path_from_task" in rpm_info:
-            return rpm_info["path_from_task"]
+            return self.downloader.get_file(rpm_info["path_from_task"])

        pathinfo = self.koji_wrapper.koji_module.pathinfo
        paths = []

+        if "getRPMChecksums" in self.koji_proxy.system.listMethods():
+
+            def checksum_validator(keyname, pkg_path):
+                checksums = self.koji_proxy.getRPMChecksums(
+                    rpm_info["id"], checksum_types=("sha256",)
+                )
+                if "sha256" in checksums.get(keyname, {}):
+                    computed = compute_file_checksums(pkg_path, ("sha256",))
+                    if computed["sha256"] != checksums[keyname]["sha256"]:
+                        raise RuntimeError("Checksum mismatch for %s" % pkg_path)
+
+        else:
+
+            def checksum_validator(keyname, pkg_path):
+                # Koji doesn't support checksums yet
+                pass
+
        attempts_left = self.signed_packages_retries + 1
        while attempts_left > 0:
            for sigkey in self.sigkey_ordering:
@ -523,8 +565,11 @@ class KojiPackageSet(PackageSetBase):
                )
                if rpm_path not in paths:
                    paths.append(rpm_path)
-                if os.path.isfile(rpm_path):
-                    return rpm_path
+                path = self.downloader.get_file(
+                    rpm_path, partial(checksum_validator, sigkey)
+                )
+                if path:
+                    return path

            # No signed copy was found, wait a little and try again.
            attempts_left -= 1
@ -537,16 +582,18 @@ class KojiPackageSet(PackageSetBase):
            # use an unsigned copy (if allowed)
            rpm_path = os.path.join(pathinfo.build(build_info), pathinfo.rpm(rpm_info))
            paths.append(rpm_path)
-            if os.path.isfile(rpm_path):
-                return rpm_path
+            path = self.downloader.get_file(rpm_path, partial(checksum_validator, ""))
+            if path:
+                return path

        if self._allow_invalid_sigkeys and rpm_info["name"] not in self.packages:
            # use an unsigned copy (if allowed)
            rpm_path = os.path.join(pathinfo.build(build_info), pathinfo.rpm(rpm_info))
            paths.append(rpm_path)
-            if os.path.isfile(rpm_path):
+            path = self.downloader.get_file(rpm_path)
+            if path:
                self._invalid_sigkey_rpms.append(rpm_info)
-                return rpm_path
+                return path

        self._invalid_sigkey_rpms.append(rpm_info)
        self.log_error(
@ -567,7 +614,7 @@ class KojiPackageSet(PackageSetBase):
        result_srpms = []
        include_packages = set(include_packages or [])

-        if type(event) is dict:
+        if isinstance(event, dict):
            event = event["id"]

        msg = "Getting latest RPMs (tag: %s, event: %s, inherit: %s)" % (
@ -576,7 +623,9 @@ class KojiPackageSet(PackageSetBase):
            inherit,
        )
        self.log_info("[BEGIN] %s" % msg)
-        rpms, builds = self.get_latest_rpms(tag, event, inherit=inherit)
+        rpms, builds = [], []
+        if tag != MISSING_KOJI_TAG:
+            rpms, builds = self.get_latest_rpms(tag, event, inherit=inherit)
        extra_rpms, extra_builds = self.get_extra_rpms()
        rpms += extra_rpms
        builds += extra_builds
@ -681,6 +730,15 @@ class KojiPackageSet(PackageSetBase):
        :param include_packages: an iterable of tuples (package name, arch) that should
                                 be included.
        """
+        if len(self.sigkey_ordering) > 1 and (
+            None in self.sigkey_ordering or "" in self.sigkey_ordering
+        ):
+            self.log_warning(
+                "Stop writing reuse file as unsigned packages are allowed "
+                "in the compose."
+            )
+            return
+
        reuse_file = compose.paths.work.pkgset_reuse_file(self.name)
        self.log_info("Writing pkgset reuse file: %s" % reuse_file)
        try:
@ -697,6 +755,13 @@ class KojiPackageSet(PackageSetBase):
                        "srpms_by_name": self.srpms_by_name,
                        "extra_builds": self.extra_builds,
                        "include_packages": include_packages,
+                        "inherit_to_noarch": compose.conf[
+                            "pkgset_inherit_exclusive_arch_to_noarch"
+                        ],
+                        "exclusive_noarch": compose.conf[
+                            "pkgset_exclusive_arch_considers_noarch"
+                        ],
+                        "module_defaults_dir": compose.conf.get("module_defaults_dir"),
                    },
                    f,
                    protocol=pickle.HIGHEST_PROTOCOL,
@ -791,6 +856,9 @@ class KojiPackageSet(PackageSetBase):
            self.log_debug("Failed to load reuse file: %s" % str(e))
            return False

+        inherit_to_noarch = compose.conf["pkgset_inherit_exclusive_arch_to_noarch"]
+        exclusive_noarch = compose.conf["pkgset_exclusive_arch_considers_noarch"]
+        module_defaults_dir = compose.conf.get("module_defaults_dir")
        if (
            reuse_data["allow_invalid_sigkeys"] == self._allow_invalid_sigkeys
            and reuse_data["packages"] == self.packages
@ -798,6 +866,11 @@ class KojiPackageSet(PackageSetBase):
            and reuse_data["extra_builds"] == self.extra_builds
            and reuse_data["sigkeys"] == self.sigkey_ordering
            and reuse_data["include_packages"] == include_packages
+            # If the value is not present in reuse data, the compose was
+            # generated with older version of Pungi. Best to not reuse.
+            and reuse_data.get("inherit_to_noarch") == inherit_to_noarch
+            and reuse_data.get("exclusive_noarch") == exclusive_noarch
+            and reuse_data.get("module_defaults_dir") == module_defaults_dir
        ):
            self.log_info("Copying repo data for reuse: %s" % old_repo_dir)
            copy_all(old_repo_dir, repo_dir)
--- a/pungi/phases/pkgset/sources/source_koji.py
+++ b/pungi/phases/pkgset/sources/source_koji.py
@ -193,17 +193,13 @@ class PkgsetSourceKoji(pungi.phases.pkgset.source.PkgsetSourceBase):
    def __call__(self):
        compose = self.compose
        self.koji_wrapper = pungi.wrappers.kojiwrapper.KojiWrapper(compose)
-        # path prefix must contain trailing '/'
-        path_prefix = self.koji_wrapper.koji_module.config.topdir.rstrip("/") + "/"
-        package_sets = get_pkgset_from_koji(
-            self.compose, self.koji_wrapper, path_prefix
-        )
-        return (package_sets, path_prefix)
+        package_sets = get_pkgset_from_koji(self.compose, self.koji_wrapper)
+        return (package_sets, self.compose.koji_downloader.path_prefix)


-def get_pkgset_from_koji(compose, koji_wrapper, path_prefix):
+def get_pkgset_from_koji(compose, koji_wrapper):
    event_info = get_koji_event_info(compose, koji_wrapper)
-    return populate_global_pkgset(compose, koji_wrapper, path_prefix, event_info)
+    return populate_global_pkgset(compose, koji_wrapper, event_info)


 def _add_module_to_variant(
@ -226,20 +222,23 @@ def _add_module_to_variant(
    """
    mmds = {}
    archives = koji_wrapper.koji_proxy.listArchives(build["id"])
+    available_arches = set()
    for archive in archives:
        if archive["btype"] != "module":
            # Skip non module archives
            continue
        typedir = koji_wrapper.koji_module.pathinfo.typedir(build, archive["btype"])
        filename = archive["filename"]
-        file_path = os.path.join(typedir, filename)
+        file_path = compose.koji_downloader.get_file(os.path.join(typedir, filename))
        try:
            # If there are two dots, the arch is in the middle. MBS uploads
            # files with actual architecture in the filename, but Pungi deals
            # in basearch. This assumes that each arch in the build maps to a
            # unique basearch.
            _, arch, _ = filename.split(".")
-            filename = "modulemd.%s.txt" % getBaseArch(arch)
+            basearch = getBaseArch(arch)
+            filename = "modulemd.%s.txt" % basearch
+            available_arches.add(basearch)
        except ValueError:
            pass
        mmds[filename] = file_path
@ -264,15 +263,26 @@ def _add_module_to_variant(
            compose.log_debug("Module %s is filtered from %s.%s", nsvc, variant, arch)
            continue

+        if arch not in available_arches:
+            compose.log_debug(
+                "Module %s is not available for arch %s.%s", nsvc, variant, arch
+            )
+            continue
+
        filename = "modulemd.%s.txt" % arch
        if filename not in mmds:
            raise RuntimeError(
                "Module %s does not have metadata for arch %s and is not filtered "
                "out via filter_modules option." % (nsvc, arch)
            )
-        mod_stream = read_single_module_stream_from_file(
-            mmds[filename], compose, arch, build
-        )
+        try:
+            mod_stream = read_single_module_stream_from_file(
+                mmds[filename], compose, arch, build
+            )
+        except Exception as exc:
+            # libmodulemd raises various GLib exceptions with not very helpful
+            # messages. Let's replace it with something more useful.
+            raise RuntimeError("Failed to read %s: %s", mmds[filename], str(exc))
        if mod_stream:
            added = True
        variant.arch_mmds.setdefault(arch, {})[nsvc] = mod_stream
@ -395,7 +405,13 @@ def _is_filtered_out(compose, variant, arch, module_name, module_stream):


 def _get_modules_from_koji(
-    compose, koji_wrapper, event, variant, variant_tags, tag_to_mmd, exclude_module_ns
+    compose,
+    koji_wrapper,
+    event,
+    variant,
+    variant_tags,
+    tag_to_mmd,
+    exclude_module_ns,
 ):
    """
    Loads modules for given `variant` from koji `session`, adds them to
@ -480,7 +496,16 @@ def filter_inherited(koji_proxy, event, module_builds, top_tag):
        # And keep only builds from that topmost tag
        result.extend(build for build in builds if build["tag_name"] == tag)

-    return result
+    # If the same module was inherited multiple times, it will be in result
+    # multiple times. We need to deduplicate.
+    deduplicated_result = []
+    included_nvrs = set()
+    for build in result:
+        if build["nvr"] not in included_nvrs:
+            deduplicated_result.append(build)
+            included_nvrs.add(build["nvr"])
+
+    return deduplicated_result


 def filter_by_whitelist(compose, module_builds, input_modules, expected_modules):
@ -670,7 +695,7 @@ def _get_modules_from_koji_tags(
        )


-def populate_global_pkgset(compose, koji_wrapper, path_prefix, event):
+def populate_global_pkgset(compose, koji_wrapper, event):
    all_arches = get_all_arches(compose)

    # List of compose tags from which we create this compose
@ -764,7 +789,12 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event):

        if extra_modules:
            _add_extra_modules_to_variant(
-                compose, koji_wrapper, variant, extra_modules, variant_tags, tag_to_mmd
+                compose,
+                koji_wrapper,
+                variant,
+                extra_modules,
+                variant_tags,
+                tag_to_mmd,
            )

        variant_scratch_modules = get_variant_data(
@ -791,17 +821,23 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event):

    pkgsets = []

+    extra_builds = force_list(compose.conf.get("pkgset_koji_builds", []))
+    extra_tasks = force_list(compose.conf.get("pkgset_koji_scratch_tasks", []))
+
+    if not pkgset_koji_tags and (extra_builds or extra_tasks):
+        # We have extra packages to pull in, but no tag to merge them with.
+        compose_tags.append(pungi.phases.pkgset.pkgsets.MISSING_KOJI_TAG)
+        pkgset_koji_tags.append(pungi.phases.pkgset.pkgsets.MISSING_KOJI_TAG)
+
    # Get package set for each compose tag and merge it to global package
    # list. Also prepare per-variant pkgset, because we do not have list
    # of binary RPMs in module definition - there is just list of SRPMs.
    for compose_tag in compose_tags:
        compose.log_info("Loading package set for tag %s", compose_tag)
+        kwargs = {}
        if compose_tag in pkgset_koji_tags:
-            extra_builds = force_list(compose.conf.get("pkgset_koji_builds", []))
-            extra_tasks = force_list(compose.conf.get("pkgset_koji_scratch_tasks", []))
-        else:
-            extra_builds = []
-            extra_tasks = []
+            kwargs["extra_builds"] = extra_builds
+            kwargs["extra_tasks"] = extra_tasks

        pkgset = pungi.phases.pkgset.pkgsets.KojiPackageSet(
            compose_tag,
@ -813,10 +849,10 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event):
            allow_invalid_sigkeys=allow_invalid_sigkeys,
            populate_only_packages=populate_only_packages_to_gather,
            cache_region=compose.cache_region,
-            extra_builds=extra_builds,
-            extra_tasks=extra_tasks,
            signed_packages_retries=compose.conf["signed_packages_retries"],
            signed_packages_wait=compose.conf["signed_packages_wait"],
+            downloader=compose.koji_downloader,
+            **kwargs
        )

        # Check if we have cache for this tag from previous compose. If so, use
@ -874,13 +910,18 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event):
        if pkgset.reuse is None:
            pkgset.populate(
                compose_tag,
-                event,
+                # We care about packages as they existed on the specified
+                # event. However, modular content tags are not expected to
+                # change, so the event doesn't matter there. If an exact NSVC
+                # of a module is specified, the code above would happily find
+                # its content tag, but fail here if the content tag doesn't
+                # exist at the given event.
+                event=event if is_traditional else None,
                inherit=should_inherit,
                include_packages=modular_packages,
            )
        for variant in compose.all_variants.values():
            if compose_tag in variant_tags[variant]:
-
                # If it's a modular tag, store the package set for the module.
                for nsvc, koji_tag in variant.module_uid_to_koji_tag.items():
                    if compose_tag == koji_tag:
@ -903,7 +944,7 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event):
                MaterializedPackageSet.create,
                compose,
                pkgset,
-                path_prefix,
+                compose.koji_downloader.path_prefix,
                mmd=tag_to_mmd.get(pkgset.name),
            )
        )
--- a/pungi/runroot.py
+++ b/pungi/runroot.py
@ -13,13 +13,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <https://gnu.org/licenses/>.

+import contextlib
 import os
 import re
+import shutil
+import tarfile
+
+import requests
 import six
 from six.moves import shlex_quote
 import kobo.log
 from kobo.shortcuts import run

+from pungi import util
 from pungi.wrappers import kojiwrapper


@ -230,9 +236,9 @@ class Runroot(kobo.log.LoggingBase):
                fmt_dict["runroot_key"] = runroot_key
            self._ssh_run(hostname, user, run_template, fmt_dict, log_file=log_file)

-            fmt_dict[
-                "command"
-            ] = "rpm -qa --qf='%{name}-%{version}-%{release}.%{arch}\n'"
+            fmt_dict["command"] = (
+                "rpm -qa --qf='%{name}-%{version}-%{release}.%{arch}\n'"
+            )
            buildroot_rpms = self._ssh_run(
                hostname,
                user,
@ -314,7 +320,8 @@ class Runroot(kobo.log.LoggingBase):
            arch,
            args,
            channel=runroot_channel,
-            chown_uid=os.getuid(),
+            # We want to change owner only if shared NFS directory is used.
+            chown_uid=os.getuid() if kwargs.get("mounts") else None,
            **kwargs
        )

@ -325,6 +332,7 @@ class Runroot(kobo.log.LoggingBase):
                % (output["task_id"], log_file)
            )
        self._result = output
+        return output["task_id"]

    def run_pungi_ostree(self, args, log_file=None, arch=None, **kwargs):
        """
@ -381,3 +389,72 @@ class Runroot(kobo.log.LoggingBase):
            return self._result
        else:
            raise ValueError("Unknown runroot_method %r." % self.runroot_method)
+
+
+@util.retry(wait_on=requests.exceptions.RequestException)
+def _download_file(url, dest):
+    # contextlib.closing is only needed in requests<2.18
+    with contextlib.closing(requests.get(url, stream=True, timeout=5)) as r:
+        if r.status_code == 404:
+            raise RuntimeError("Archive %s not found" % url)
+        r.raise_for_status()
+        with open(dest, "wb") as f:
+            shutil.copyfileobj(r.raw, f)
+
+
+def _download_archive(task_id, fname, archive_url, dest_dir):
+    """Download file from URL to a destination, with retries."""
+    temp_file = os.path.join(dest_dir, fname)
+    _download_file(archive_url, temp_file)
+    return temp_file
+
+
+def _extract_archive(task_id, fname, archive_file, dest_path):
+    """Extract the archive into given destination.
+
+    All items of the archive must match the name of the archive, i.e. all
+    paths in foo.tar.gz must start with foo/.
+    """
+    basename = os.path.basename(fname).split(".")[0]
+    strip_prefix = basename + "/"
+    with tarfile.open(archive_file, "r") as archive:
+        for member in archive.getmembers():
+            # Check if each item is either the root directory or is within it.
+            if member.name != basename and not member.name.startswith(strip_prefix):
+                raise RuntimeError(
+                    "Archive %s from task %s contains file without expected prefix: %s"
+                    % (fname, task_id, member)
+                )
+            dest = os.path.join(dest_path, member.name[len(strip_prefix) :])
+            if member.isdir():
+                # Create directories where needed...
+                util.makedirs(dest)
+            elif member.isfile():
+                # ... and extract files into them.
+                with open(dest, "wb") as dest_obj:
+                    shutil.copyfileobj(archive.extractfile(member), dest_obj)
+            elif member.islnk():
+                # We have a hardlink. Let's also link it.
+                linked_file = os.path.join(
+                    dest_path, member.linkname[len(strip_prefix) :]
+                )
+                os.link(linked_file, dest)
+            else:
+                # Any other file type is an error.
+                raise RuntimeError(
+                    "Unexpected file type in %s from task %s: %s"
+                    % (fname, task_id, member)
+                )
+
+
+def download_and_extract_archive(compose, task_id, fname, destination):
+    """Download a tar archive from task outputs and extract it to the destination."""
+    koji = kojiwrapper.KojiWrapper(compose).koji_module
+    # Koji API provides downloadTaskOutput method, but it's not usable as it
+    # will attempt to load the entire file into memory.
+    # So instead let's generate a patch and attempt to convert it to a URL.
+    server_path = os.path.join(koji.pathinfo.task(task_id), fname)
+    archive_url = server_path.replace(koji.config.topdir, koji.config.topurl)
+    with util.temp_dir(prefix="buildinstall-download") as tmp_dir:
+        local_path = _download_archive(task_id, fname, archive_url, tmp_dir)
+        _extract_archive(task_id, fname, local_path, destination)
--- a/pungi/scripts/cache_cleanup.py
+++ b/pungi/scripts/cache_cleanup.py
@ -0,0 +1,63 @@
+import argparse
+import os
+import re
+import time
+
+from pungi.util import format_size
+
+
+LOCK_RE = re.compile(r".*\.lock(\|[A-Za-z0-9]+)*$")
+
+
+def should_be_cleaned_up(path, st, threshold):
+    if st.st_nlink == 1 and st.st_mtime < threshold:
+        # No other instances, older than limit
+        return True
+
+    if LOCK_RE.match(path) and st.st_mtime < threshold:
+        # Suspiciously old lock
+        return True
+
+    return False
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("CACHE_DIR")
+    parser.add_argument("-n", "--dry-run", action="store_true")
+    parser.add_argument("--verbose", action="store_true")
+    parser.add_argument(
+        "--max-age",
+        help="how old files should be considered for deletion",
+        default=7,
+        type=int,
+    )
+
+    args = parser.parse_args()
+
+    topdir = os.path.abspath(args.CACHE_DIR)
+    max_age = args.max_age * 24 * 3600
+
+    cleaned_up = 0
+
+    threshold = time.time() - max_age
+    for dirpath, dirnames, filenames in os.walk(topdir):
+        for f in filenames:
+            filepath = os.path.join(dirpath, f)
+            st = os.stat(filepath)
+            if should_be_cleaned_up(filepath, st, threshold):
+                if args.verbose:
+                    print("RM %s" % filepath)
+                cleaned_up += st.st_size
+                if not args.dry_run:
+                    os.remove(filepath)
+        if not dirnames and not filenames:
+            if args.verbose:
+                print("RMDIR %s" % dirpath)
+            if not args.dry_run:
+                os.rmdir(dirpath)
+
+    if args.dry_run:
+        print("Would reclaim %s bytes." % format_size(cleaned_up))
+    else:
+        print("Reclaimed %s bytes." % format_size(cleaned_up))
--- a/pungi/scripts/config_dump.py
+++ b/pungi/scripts/config_dump.py
@ -171,32 +171,11 @@ def main():
    group.add_argument(
        "--offline", action="store_true", help="Do not resolve git references."
    )
-    parser.add_argument(
-        "--multi",
-        metavar="DIR",
-        help=(
-            "Treat source as config for pungi-orchestrate and store dump into "
-            "given directory."
-        ),
-    )

    args = parser.parse_args()

    defines = config_utils.extract_defines(args.define)

-    if args.multi:
-        if len(args.sources) > 1:
-            parser.error("Only one multi config can be specified.")
-
-        return dump_multi_config(
-            args.sources[0],
-            dest=args.multi,
-            defines=defines,
-            just_dump=args.just_dump,
-            event=args.freeze_event,
-            offline=args.offline,
-        )
-
    return process_file(
        args.sources,
        defines=defines,
--- a/pungi/scripts/config_validate.py
+++ b/pungi/scripts/config_validate.py
@ -128,7 +128,6 @@ def run(config, topdir, has_old, offline, defined_variables, schema_overrides):
        pungi.phases.OSTreePhase(compose),
        pungi.phases.CreateisoPhase(compose, buildinstall_phase),
        pungi.phases.ExtraIsosPhase(compose, buildinstall_phase),
-        pungi.phases.LiveImagesPhase(compose),
        pungi.phases.LiveMediaPhase(compose),
        pungi.phases.ImageBuildPhase(compose),
        pungi.phases.ImageChecksumPhase(compose),
--- a/pungi/scripts/fedmsg_notification.py
+++ b/pungi/scripts/fedmsg_notification.py
@ -14,6 +14,9 @@ def send(cmd, data):
    topic = "compose.%s" % cmd.replace("-", ".").lower()
    try:
        msg = fedora_messaging.api.Message(topic="pungi.{}".format(topic), body=data)
+        if cmd == "ostree":
+            # https://pagure.io/fedora-infrastructure/issue/10899
+            msg.priority = 3
        fedora_messaging.api.publish(msg)
    except fedora_messaging.exceptions.PublishReturned as e:
        print("Fedora Messaging broker rejected message %s: %s" % (msg.id, e))
--- a/pungi/scripts/pungi.py
+++ b/pungi/scripts/pungi.py
@ -319,7 +319,6 @@ def get_arguments(config):


 def main():
-
    config = pungi.config.Config()
    opts = get_arguments(config)

@ -479,8 +478,7 @@ def main():
                print("RPM size:       %s MiB" % (mypungi.size_packages() / 1024**2))
                if not opts.nodebuginfo:
                    print(
-                        "DEBUGINFO size: %s MiB"
-                        % (mypungi.size_debuginfo() / 1024**2)
+                        "DEBUGINFO size: %s MiB" % (mypungi.size_debuginfo() / 1024**2)
                    )
                if not opts.nosource:
                    print("SRPM size:      %s MiB" % (mypungi.size_srpms() / 1024**2))
--- a/pungi/scripts/pungi_gather.py
+++ b/pungi/scripts/pungi_gather.py
@ -97,6 +97,7 @@ def main(ns, persistdir, cachedir):
    dnf_conf = Conf(ns.arch)
    dnf_conf.persistdir = persistdir
    dnf_conf.cachedir = cachedir
+    dnf_conf.optional_metadata_types = ["filelists"]
    dnf_obj = DnfWrapper(dnf_conf)

    gather_opts = GatherOptions()
--- a/pungi/scripts/pungi_koji.py
+++ b/pungi/scripts/pungi_koji.py
@ -23,6 +23,7 @@ from pungi.phases import PHASES_NAMES
 from pungi import get_full_version, util
 from pungi.errors import UnsignedPackagesError
 from pungi.wrappers import kojiwrapper
+from pungi.util import rmtree


 # force C locales
@ -300,7 +301,12 @@ def main():

    if opts.target_dir:
        compose_dir = Compose.get_compose_dir(
-            opts.target_dir, conf, compose_type=compose_type, compose_label=opts.label
+            opts.target_dir,
+            conf,
+            compose_type=compose_type,
+            compose_label=opts.label,
+            parent_compose_ids=opts.parent_compose_id,
+            respin_of=opts.respin_of,
        )
    else:
        compose_dir = opts.compose_dir
@ -380,6 +386,14 @@ def run_compose(
    compose.log_info("Current timezone offset: %s" % pungi.util.get_tz_offset())
    compose.log_info("COMPOSE_ID=%s" % compose.compose_id)

+    installed_pkgs_log = compose.paths.log.log_file("global", "installed-pkgs")
+    compose.log_info("Logging installed packages to %s" % installed_pkgs_log)
+    try:
+        with open(installed_pkgs_log, "w") as f:
+            subprocess.Popen(["rpm", "-qa"], stdout=f)
+    except Exception as e:
+        compose.log_warning("Failed to log installed packages: %s" % str(e))
+
    compose.read_variants()

    # dump the config file
@ -403,11 +417,12 @@ def run_compose(
        compose, buildinstall_phase, pkgset_phase
    )
    ostree_phase = pungi.phases.OSTreePhase(compose, pkgset_phase)
+    ostree_container_phase = pungi.phases.OSTreeContainerPhase(compose, pkgset_phase)
    createiso_phase = pungi.phases.CreateisoPhase(compose, buildinstall_phase)
    extra_isos_phase = pungi.phases.ExtraIsosPhase(compose, buildinstall_phase)
-    liveimages_phase = pungi.phases.LiveImagesPhase(compose)
    livemedia_phase = pungi.phases.LiveMediaPhase(compose)
    image_build_phase = pungi.phases.ImageBuildPhase(compose, buildinstall_phase)
+    kiwibuild_phase = pungi.phases.KiwiBuildPhase(compose)
    osbuild_phase = pungi.phases.OSBuildPhase(compose)
    osbs_phase = pungi.phases.OSBSPhase(compose, pkgset_phase, buildinstall_phase)
    image_container_phase = pungi.phases.ImageContainerPhase(compose)
@ -424,17 +439,18 @@ def run_compose(
        gather_phase,
        extrafiles_phase,
        createiso_phase,
-        liveimages_phase,
        livemedia_phase,
        image_build_phase,
        image_checksum_phase,
        test_phase,
        ostree_phase,
        ostree_installer_phase,
+        ostree_container_phase,
        extra_isos_phase,
        osbs_phase,
        osbuild_phase,
        image_container_phase,
+        kiwibuild_phase,
    ):
        if phase.skip():
            continue
@ -449,50 +465,6 @@ def run_compose(
            print(i)
        raise RuntimeError("Configuration is not valid")

-    # PREP
-
-    # Note: This may be put into a new method of phase classes (e.g. .prep())
-    # in same way as .validate() or .run()
-
-    # Prep for liveimages - Obtain a password for signing rpm wrapped images
-    if (
-        "signing_key_password_file" in compose.conf
-        and "signing_command" in compose.conf
-        and "%(signing_key_password)s" in compose.conf["signing_command"]
-        and not liveimages_phase.skip()
-    ):
-        # TODO: Don't require key if signing is turned off
-        # Obtain signing key password
-        signing_key_password = None
-
-        # Use appropriate method
-        if compose.conf["signing_key_password_file"] == "-":
-            # Use stdin (by getpass module)
-            try:
-                signing_key_password = getpass.getpass("Signing key password: ")
-            except EOFError:
-                compose.log_debug("Ignoring signing key password")
-                pass
-        else:
-            # Use text file with password
-            try:
-                signing_key_password = (
-                    open(compose.conf["signing_key_password_file"], "r")
-                    .readline()
-                    .rstrip("\n")
-                )
-            except IOError:
-                # Filename is not print intentionally in case someone puts
-                # password directly into the option
-                err_msg = "Cannot load password from file specified by 'signing_key_password_file' option"  # noqa: E501
-                compose.log_error(err_msg)
-                print(err_msg)
-                raise RuntimeError(err_msg)
-
-        if signing_key_password:
-            # Store the password
-            compose.conf["signing_key_password"] = signing_key_password
-
    init_phase.start()
    init_phase.stop()

@ -505,6 +477,7 @@ def run_compose(
        (gather_phase, createrepo_phase),
        extrafiles_phase,
        (ostree_phase, ostree_installer_phase),
+        ostree_container_phase,
    )
    essentials_phase = pungi.phases.WeaverPhase(compose, essentials_schema)
    essentials_phase.start()
@ -529,10 +502,10 @@ def run_compose(
    compose_images_schema = (
        createiso_phase,
        extra_isos_phase,
-        liveimages_phase,
        image_build_phase,
        livemedia_phase,
        osbuild_phase,
+        kiwibuild_phase,
    )
    post_image_phase = pungi.phases.WeaverPhase(
        compose, (image_checksum_phase, image_container_phase)
@ -554,10 +527,11 @@ def run_compose(
        and ostree_installer_phase.skip()
        and createiso_phase.skip()
        and extra_isos_phase.skip()
-        and liveimages_phase.skip()
        and livemedia_phase.skip()
        and image_build_phase.skip()
+        and kiwibuild_phase.skip()
        and osbuild_phase.skip()
+        and ostree_container_phase.skip()
    ):
        compose.im.dump(compose.paths.compose.metadata("images.json"))
    compose.dump_containers_metadata()
@ -671,7 +645,7 @@ def cli_main():
    except (Exception, KeyboardInterrupt) as ex:
        if COMPOSE:
            COMPOSE.log_error("Compose run failed: %s" % ex)
-            COMPOSE.traceback()
+            COMPOSE.traceback(show_locals=getattr(ex, "show_locals", True))
            COMPOSE.log_critical("Compose failed: %s" % COMPOSE.topdir)
            COMPOSE.write_status("DOOMED")
        else:
@ -680,3 +654,8 @@ def cli_main():
        sys.stdout.flush()
        sys.stderr.flush()
        sys.exit(1)
+    finally:
+        # Remove repositories cloned during ExtraFiles phase
+        process_id = os.getpid()
+        directoy_to_remove = "/tmp/pungi-temp-git-repos-" + str(process_id) + "/"
+        rmtree(directoy_to_remove)
--- a/pungi/util.py
+++ b/pungi/util.py
@ -279,7 +279,7 @@ class GitUrlResolveError(RuntimeError):
    pass


-def resolve_git_ref(repourl, ref):
+def resolve_git_ref(repourl, ref, credential_helper=None):
    """Resolve a reference in a Git repo to a commit.

    Raises RuntimeError if there was an error. Most likely cause is failure to
@ -289,7 +289,7 @@ def resolve_git_ref(repourl, ref):
        # This looks like a commit ID already.
        return ref
    try:
-        _, output = git_ls_remote(repourl, ref)
+        _, output = git_ls_remote(repourl, ref, credential_helper)
    except RuntimeError as e:
        raise GitUrlResolveError(
            "ref does not exist in remote repo %s with the error %s %s"
@ -316,7 +316,7 @@ def resolve_git_ref(repourl, ref):
    return lines[0].split()[0]


-def resolve_git_url(url):
+def resolve_git_url(url, credential_helper=None):
    """Given a url to a Git repo specifying HEAD or origin/<branch> as a ref,
    replace that specifier with actual SHA1 of the commit.

@ -335,7 +335,7 @@ def resolve_git_url(url):
    scheme = r.scheme.replace("git+", "")

    baseurl = urllib.parse.urlunsplit((scheme, r.netloc, r.path, "", ""))
-    fragment = resolve_git_ref(baseurl, ref)
+    fragment = resolve_git_ref(baseurl, ref, credential_helper)

    result = urllib.parse.urlunsplit((r.scheme, r.netloc, r.path, r.query, fragment))
    if "?#" in url:
@ -354,13 +354,18 @@ class GitUrlResolver(object):
        self.offline = offline
        self.cache = {}

-    def __call__(self, url, branch=None):
+    def __call__(self, url, branch=None, options=None):
+        credential_helper = options.get("credential_helper") if options else None
        if self.offline:
            return branch or url
        key = (url, branch)
        if key not in self.cache:
            try:
-                res = resolve_git_ref(url, branch) if branch else resolve_git_url(url)
+                res = (
+                    resolve_git_ref(url, branch, credential_helper)
+                    if branch
+                    else resolve_git_url(url, credential_helper)
+                )
                self.cache[key] = res
            except GitUrlResolveError as exc:
                self.cache[key] = exc
@ -456,6 +461,9 @@ def get_volid(compose, arch, variant=None, disc_type=False, formats=None, **kwar
        if not variant_uid and "%(variant)s" in i:
            continue
        try:
+            # fmt: off
+            # Black wants to add a comma after kwargs, but that's not valid in
+            # Python 2.7
            args = get_format_substs(
                compose,
                variant=variant_uid,
@ -467,6 +475,7 @@ def get_volid(compose, arch, variant=None, disc_type=False, formats=None, **kwar
                base_product_version=base_product_version,
                **kwargs
            )
+            # fmt: on
            volid = (i % args).format(**args)
        except KeyError as err:
            raise RuntimeError(
@ -991,8 +1000,12 @@ def retry(timeout=120, interval=30, wait_on=Exception):


@retry(wait_on=RuntimeError)
-def git_ls_remote(baseurl, ref):
-    return run(["git", "ls-remote", baseurl, ref], universal_newlines=True)
+def git_ls_remote(baseurl, ref, credential_helper=None):
+    cmd = ["git"]
+    if credential_helper:
+        cmd.extend(["-c", "credential.useHttpPath=true"])
+        cmd.extend(["-c", "credential.helper=%s" % credential_helper])
+    return run(cmd + ["ls-remote", baseurl, ref], universal_newlines=True)


 def get_tz_offset():
@ -1137,3 +1150,16 @@ def read_json_file(file_path):
    """A helper function to read a JSON file."""
    with open(file_path) as f:
        return json.load(f)
+
+
+UNITS = ["", "Ki", "Mi", "Gi", "Ti"]
+
+
+def format_size(sz):
+    sz = float(sz)
+    unit = 0
+    while sz > 1024:
+        sz /= 1024
+        unit += 1
+
+    return "%.3g %sB" % (sz, UNITS[unit])
--- a/pungi/wrappers/comps.py
+++ b/pungi/wrappers/comps.py
@ -183,15 +183,16 @@ class CompsFilter(object):
        """
        all_groups = self.tree.xpath("/comps/group/id/text()") + lookaside_groups
        for environment in self.tree.xpath("/comps/environment"):
-            for group in environment.xpath("grouplist/groupid"):
-                if group.text not in all_groups:
-                    group.getparent().remove(group)
+            for parent_tag in ("grouplist", "optionlist"):
+                for group in environment.xpath("%s/groupid" % parent_tag):
+                    if group.text not in all_groups:
+                        group.getparent().remove(group)

-            for group in environment.xpath("grouplist/groupid[@arch]"):
-                value = group.attrib.get("arch")
-                values = [v for v in re.split(r"[, ]+", value) if v]
-                if arch not in values:
-                    group.getparent().remove(group)
+                for group in environment.xpath("%s/groupid[@arch]" % parent_tag):
+                    value = group.attrib.get("arch")
+                    values = [v for v in re.split(r"[, ]+", value) if v]
+                    if arch not in values:
+                        group.getparent().remove(group)

    def remove_empty_environments(self):
        """
--- a/pungi/wrappers/iso.py
+++ b/pungi/wrappers/iso.py
@ -260,31 +260,41 @@ def get_isohybrid_cmd(iso_path, arch):
    return cmd


-def get_manifest_cmd(iso_name, xorriso=False):
+def get_manifest_cmd(iso_name, xorriso=False, output_file=None):
+    if not output_file:
+        output_file = "%s.manifest" % iso_name
+
    if xorriso:
        return """xorriso -dev %s --find |
            tail -n+2 |
            tr -d "'" |
            cut -c2- |
-            sort >> %s.manifest""" % (
-            shlex_quote(iso_name),
+            sort >> %s""" % (
            shlex_quote(iso_name),
+            shlex_quote(output_file),
        )
    else:
-        return "isoinfo -R -f -i %s | grep -v '/TRANS.TBL$' | sort >> %s.manifest" % (
-            shlex_quote(iso_name),
+        return "isoinfo -R -f -i %s | grep -v '/TRANS.TBL$' | sort >> %s" % (
            shlex_quote(iso_name),
+            shlex_quote(output_file),
        )


-def get_volume_id(path):
-    cmd = ["isoinfo", "-d", "-i", path]
-    retcode, output = run(cmd, universal_newlines=True)
+def get_volume_id(path, xorriso=False):
+    if xorriso:
+        cmd = ["xorriso", "-indev", path]
+        retcode, output = run(cmd, universal_newlines=True)
+        for line in output.splitlines():
+            if line.startswith("Volume id"):
+                return line.split("'")[1]
+    else:
+        cmd = ["isoinfo", "-d", "-i", path]
+        retcode, output = run(cmd, universal_newlines=True)

-    for line in output.splitlines():
-        line = line.strip()
-        if line.startswith("Volume id:"):
-            return line[11:].strip()
+        for line in output.splitlines():
+            line = line.strip()
+            if line.startswith("Volume id:"):
+                return line[11:].strip()

    raise RuntimeError("Could not read Volume ID")

@ -506,3 +516,21 @@ def mount(image, logger=None, use_guestmount=True):
                util.run_unmount_cmd(["fusermount", "-u", mount_dir], path=mount_dir)
            else:
                util.run_unmount_cmd(["umount", mount_dir], path=mount_dir)
+
+
+def xorriso_commands(arch, input, output):
+    """List of xorriso commands to modify a bootable image."""
+    commands = [
+        ("-indev", input),
+        ("-outdev", output),
+        # isoinfo -J uses the Joliet tree, and it's used by virt-install
+        ("-joliet", "on"),
+        # Support long filenames in the Joliet trees. Repodata is particularly
+        # likely to run into this limit.
+        ("-compliance", "joliet_long_names"),
+        ("-boot_image", "any", "replay"),
+    ]
+    if arch == "ppc64le":
+        # This is needed for the image to be bootable.
+        commands.append(("-as", "mkisofs", "-U", "--"))
+    return commands
--- a/pungi/wrappers/kojiwrapper.py
+++ b/pungi/wrappers/kojiwrapper.py
@ -14,17 +14,23 @@
 # along with this program; if not, see <https://gnu.org/licenses/>.


+import contextlib
 import os
 import re
+import socket
+import shutil
 import time
 import threading
-import contextlib
+
+import requests

 import koji
 from kobo.shortcuts import run, force_list
 import six
 from six.moves import configparser, shlex_quote
 import six.moves.xmlrpc_client as xmlrpclib
+from flufl.lock import Lock
+from datetime import timedelta

 from .. import util
 from ..arch_utils import getBaseArch
@ -407,92 +413,6 @@ class KojiWrapper(object):

        return cmd

-    def get_create_image_cmd(
-        self,
-        name,
-        version,
-        target,
-        arch,
-        ks_file,
-        repos,
-        image_type="live",
-        image_format=None,
-        release=None,
-        wait=True,
-        archive=False,
-        specfile=None,
-        ksurl=None,
-    ):
-        # Usage: koji spin-livecd [options] <name> <version> <target> <arch> <kickstart-file>  # noqa: E501
-        # Usage: koji spin-appliance [options] <name> <version> <target> <arch> <kickstart-file>  # noqa: E501
-        # Examples:
-        #  * name: RHEL-7.0
-        #  * name: Satellite-6.0.1-RHEL-6
-        #  ** -<type>.<arch>
-        #  * version: YYYYMMDD[.n|.t].X
-        #  * release: 1
-
-        cmd = self._get_cmd()
-
-        if image_type == "live":
-            cmd.append("spin-livecd")
-        elif image_type == "appliance":
-            cmd.append("spin-appliance")
-        else:
-            raise ValueError("Invalid image type: %s" % image_type)
-
-        if not archive:
-            cmd.append("--scratch")
-
-        cmd.append("--noprogress")
-
-        if wait:
-            cmd.append("--wait")
-        else:
-            cmd.append("--nowait")
-
-        if specfile:
-            cmd.append("--specfile=%s" % specfile)
-
-        if ksurl:
-            cmd.append("--ksurl=%s" % ksurl)
-
-        if isinstance(repos, list):
-            for repo in repos:
-                cmd.append("--repo=%s" % repo)
-        else:
-            cmd.append("--repo=%s" % repos)
-
-        if image_format:
-            if image_type != "appliance":
-                raise ValueError("Format can be specified only for appliance images'")
-            supported_formats = ["raw", "qcow", "qcow2", "vmx"]
-            if image_format not in supported_formats:
-                raise ValueError(
-                    "Format is not supported: %s. Supported formats: %s"
-                    % (image_format, " ".join(sorted(supported_formats)))
-                )
-            cmd.append("--format=%s" % image_format)
-
-        if release is not None:
-            cmd.append("--release=%s" % release)
-
-        # IMPORTANT: all --opts have to be provided *before* args
-        # Usage:
-        #  koji spin-livecd [options] <name> <version> <target> <arch> <kickstart-file>
-
-        cmd.append(name)
-        cmd.append(version)
-        cmd.append(target)
-
-        # i686 -> i386 etc.
-        arch = getBaseArch(arch)
-        cmd.append(arch)
-
-        cmd.append(ks_file)
-
-        return cmd
-
    def _has_connection_error(self, output):
        """Checks if output indicates connection error."""
        return re.search("error: failed to connect\n$", output)
@ -606,6 +526,7 @@ class KojiWrapper(object):
                "createImage",
                "createLiveMedia",
                "createAppliance",
+                "createKiwiImage",
            ]:
                continue

@ -785,11 +706,10 @@ class KojiWrapper(object):
        if list_of_args is None and list_of_kwargs is None:
            raise ValueError("One of list_of_args or list_of_kwargs must be set.")

-        if type(list_of_args) not in [type(None), list] or type(list_of_kwargs) not in [
-            type(None),
-            list,
-        ]:
-            raise ValueError("list_of_args and list_of_kwargs must be list or None.")
+        if list_of_args is not None and not isinstance(list_of_args, list):
+            raise ValueError("list_of_args must be list or None.")
+        if list_of_kwargs is not None and not isinstance(list_of_kwargs, list):
+            raise ValueError("list_of_kwargs must be list or None.")

        if list_of_kwargs is None:
            list_of_kwargs = [{}] * len(list_of_args)
@ -803,9 +723,9 @@ class KojiWrapper(object):

        koji_session.multicall = True
        for args, kwargs in zip(list_of_args, list_of_kwargs):
-            if type(args) != list:
+            if not isinstance(args, list):
                args = [args]
-            if type(kwargs) != dict:
+            if not isinstance(kwargs, dict):
                raise ValueError("Every item in list_of_kwargs must be a dict")
            koji_session_fnc(*args, **kwargs)

@ -813,7 +733,7 @@ class KojiWrapper(object):

        if not responses:
            return None
-        if type(responses) != list:
+        if not isinstance(responses, list):
            raise ValueError(
                "Fault element was returned for multicall of method %r: %r"
                % (koji_session_fnc, responses)
@ -829,7 +749,7 @@ class KojiWrapper(object):
        # a one-item array containing the result value,
        # or a struct of the form found inside the standard <fault> element.
        for response, args, kwargs in zip(responses, list_of_args, list_of_kwargs):
-            if type(response) == list:
+            if isinstance(response, list):
                if not response:
                    raise ValueError(
                        "Empty list returned for multicall of method %r with args %r, %r"  # noqa: E501
@ -895,3 +815,177 @@ def get_buildroot_rpms(compose, task_id):
                continue
            result.append(i)
    return sorted(result)
+
+
+class KojiDownloadProxy:
+    def __init__(self, topdir, topurl, cache_dir, logger):
+        if not topdir:
+            # This will only happen if there is either no koji_profile
+            # configured, or the profile doesn't have a topdir. In the first
+            # case there will be no koji interaction, and the second indicates
+            # broken koji configuration.
+            # We can pretend to have local access in both cases to avoid any
+            # external requests.
+            self.has_local_access = True
+            return
+
+        self.cache_dir = cache_dir
+        self.logger = logger
+
+        self.topdir = topdir
+        self.topurl = topurl
+
+        # If cache directory is configured, we want to use it (even if we
+        # actually have local access to the storage).
+        self.has_local_access = not bool(cache_dir)
+        # This is used for temporary downloaded files. The suffix is unique
+        # per-process. To prevent threads in the same process from colliding, a
+        # thread id is added later.
+        self.unique_suffix = "%s.%s" % (socket.gethostname(), os.getpid())
+        self.session = None
+        if not self.has_local_access:
+            self.session = requests.Session()
+
+    @property
+    def path_prefix(self):
+        dir = self.topdir if self.has_local_access else self.cache_dir
+        return dir.rstrip("/") + "/"
+
+    @classmethod
+    def from_config(klass, conf, logger):
+        topdir = None
+        topurl = None
+        cache_dir = None
+        if "koji_profile" in conf:
+            koji_module = koji.get_profile_module(conf["koji_profile"])
+            topdir = koji_module.config.topdir
+            topurl = koji_module.config.topurl
+
+            cache_dir = conf.get("koji_cache")
+            if cache_dir:
+                cache_dir = cache_dir.rstrip("/") + "/"
+        return klass(topdir, topurl, cache_dir, logger)
+
+    @util.retry(wait_on=requests.exceptions.RequestException)
+    def _download(self, url, dest):
+        """Download file into given location
+
+        :param str url: URL of the file to download
+        :param str dest: file path to store the result in
+        :returns: path to the downloaded file (same as dest) or None if the URL
+        """
+        # contextlib.closing is only needed in requests<2.18
+        with contextlib.closing(self.session.get(url, stream=True)) as r:
+            if r.status_code == 404:
+                self.logger.warning("GET %s NOT FOUND", url)
+                return None
+            if r.status_code != 200:
+                self.logger.error("GET %s %s", url, r.status_code)
+                r.raise_for_status()
+                # The exception from here will be retried by the decorator.
+
+            file_size = int(r.headers.get("Content-Length", 0))
+            self.logger.info("GET %s OK %s", url, util.format_size(file_size))
+            with open(dest, "wb") as f:
+                shutil.copyfileobj(r.raw, f)
+        return dest
+
+    def _delete(self, path):
+        """Try to delete file at given path and ignore errors."""
+        try:
+            os.remove(path)
+        except Exception:
+            self.logger.warning("Failed to delete %s", path)
+
+    def _atomic_download(self, url, dest, validator):
+        """Atomically download a file
+
+        :param str url: URL of the file to download
+        :param str dest: file path to store the result in
+        :returns: path to the downloaded file (same as dest) or None if the URL
+                  return 404.
+        """
+        temp_file = "%s.%s.%s" % (dest, self.unique_suffix, threading.get_ident())
+
+        # First download to the temporary location.
+        try:
+            if self._download(url, temp_file) is None:
+                # The file was not found.
+                return None
+        except Exception:
+            # Download failed, let's make sure to clean up potentially partial
+            # temporary file.
+            self._delete(temp_file)
+            raise
+
+        # Check if the temporary file is correct (assuming we were provided a
+        # validator function).
+        try:
+            if validator:
+                validator(temp_file)
+        except Exception:
+            # Validation failed. Let's delete the problematic file and re-raise
+            # the exception.
+            self._delete(temp_file)
+            raise
+
+        # Atomically move the temporary file into final location
+        os.rename(temp_file, dest)
+        return dest
+
+    def _download_file(self, path, validator):
+        """Ensure file on Koji volume in ``path`` is present in the local
+        cache.
+
+        :returns: path to the local file or None if file is not found
+        """
+        url = path.replace(self.topdir, self.topurl)
+        destination_file = path.replace(self.topdir, self.cache_dir)
+        util.makedirs(os.path.dirname(destination_file))
+
+        lock = Lock(destination_file + ".lock")
+        # Hold the lock for this file for 5 minutes. If another compose needs
+        # the same file but it's not downloaded yet, the process will wait.
+        #
+        # If the download finishes in time, the downloaded file will be used
+        # here.
+        #
+        # If the download takes longer, this process will steal the lock and
+        # start its own download.
+        #
+        # That should not be a problem: the same file will be downloaded and
+        # then replaced atomically on the filesystem. If the original process
+        # managed to hardlink the first file already, that hardlink will be
+        # broken, but that will only result in the same file stored twice.
+        lock.lifetime = timedelta(minutes=5)
+
+        with lock:
+            # Check if the file already exists. If yes, return the path.
+            if os.path.exists(destination_file):
+                # Update mtime of the file. This covers the case of packages in the
+                # tag that are not included in the compose. Updating mtime will
+                # exempt them from cleanup for extra time.
+                os.utime(destination_file)
+                return destination_file
+
+            return self._atomic_download(url, destination_file, validator)
+
+    def get_file(self, path, validator=None):
+        """
+        If path refers to an existing file in Koji, return a valid local path
+        to it. If no such file exists, return None.
+
+        :param validator: A callable that will be called with the path to the
+            downloaded file if and only if the file was actually downloaded.
+            Any exception raised from there will be abort the download and be
+            propagated.
+        """
+        if self.has_local_access:
+            # We have koji volume mounted locally. No transformation needed for
+            # the path, just check it exists.
+            if os.path.exists(path):
+                return path
+            return None
+        else:
+            # We need to download the file.
+            return self._download_file(path, validator)
--- a/pungi/wrappers/lorax.py
+++ b/pungi/wrappers/lorax.py
@ -109,55 +109,3 @@ class LoraxWrapper(object):
        # TODO: workdir

        return cmd
-
-    def get_buildinstall_cmd(
-        self,
-        product,
-        version,
-        release,
-        repo_baseurl,
-        output_dir,
-        variant=None,
-        bugurl=None,
-        nomacboot=False,
-        noupgrade=False,
-        is_final=False,
-        buildarch=None,
-        volid=None,
-        brand=None,
-    ):
-        # RHEL 6 compatibility
-        # Usage: buildinstall [--debug] --version <version> --brand <brand> --product <product> --release <comment> --final [--output outputdir] [--discs <discstring>] <root>  # noqa: E501
-
-        brand = brand or "redhat"
-        # HACK: ignore provided release
-        release = "%s %s" % (brand, version)
-        bugurl = bugurl or "https://bugzilla.redhat.com"
-
-        cmd = ["/usr/lib/anaconda-runtime/buildinstall"]
-
-        cmd.append("--debug")
-
-        cmd.extend(["--version", version])
-        cmd.extend(["--brand", brand])
-        cmd.extend(["--product", product])
-        cmd.extend(["--release", release])
-
-        if is_final:
-            cmd.append("--final")
-
-        if buildarch:
-            cmd.extend(["--buildarch", buildarch])
-
-        if bugurl:
-            cmd.extend(["--bugurl", bugurl])
-
-        output_dir = os.path.abspath(output_dir)
-        cmd.extend(["--output", output_dir])
-
-        for i in force_list(repo_baseurl):
-            if "://" not in i:
-                i = "file://%s" % os.path.abspath(i)
-            cmd.append(i)
-
-        return cmd
--- a/pungi/wrappers/scm.py
+++ b/pungi/wrappers/scm.py
@ -20,6 +20,7 @@ import os
 import shutil
 import glob
 import six
+import threading
 from six.moves import shlex_quote
 from six.moves.urllib.request import urlretrieve
 from fnmatch import fnmatch
@ -29,12 +30,15 @@ from kobo.shortcuts import run, force_list
 from pungi.util import explode_rpm_package, makedirs, copy_all, temp_dir, retry
 from .kojiwrapper import KojiWrapper

+lock = threading.Lock()
+

 class ScmBase(kobo.log.LoggingBase):
-    def __init__(self, logger=None, command=None, compose=None):
+    def __init__(self, logger=None, command=None, compose=None, options=None):
        kobo.log.LoggingBase.__init__(self, logger=logger)
        self.command = command
        self.compose = compose
+        self.options = options or {}

    @retry(interval=60, timeout=300, wait_on=RuntimeError)
    def retry_run(self, cmd, **kwargs):
@ -156,22 +160,31 @@ class GitWrapper(ScmBase):
        if "://" not in repo:
            repo = "file://%s" % repo

+        git_cmd = ["git"]
+        if "credential_helper" in self.options:
+            git_cmd.extend(["-c", "credential.useHttpPath=true"])
+            git_cmd.extend(
+                ["-c", "credential.helper=%s" % self.options["credential_helper"]]
+            )
+
        run(["git", "init"], workdir=destdir)
        try:
-            run(["git", "fetch", "--depth=1", repo, branch], workdir=destdir)
+            run(git_cmd + ["fetch", "--depth=1", repo, branch], workdir=destdir)
            run(["git", "checkout", "FETCH_HEAD"], workdir=destdir)
        except RuntimeError as e:
            # Fetch failed, to do a full clone we add a remote to our empty
            # repo, get its content and check out the reference we want.
            self.log_debug(
                "Trying to do a full clone because shallow clone failed: %s %s"
-                % (e, e.output)
+                % (e, getattr(e, "output", ""))
            )
            try:
                # Re-run git init in case of previous failure breaking .git dir
                run(["git", "init"], workdir=destdir)
                run(["git", "remote", "add", "origin", repo], workdir=destdir)
-                self.retry_run(["git", "remote", "update", "origin"], workdir=destdir)
+                self.retry_run(
+                    git_cmd + ["remote", "update", "origin"], workdir=destdir
+                )
                run(["git", "checkout", branch], workdir=destdir)
            except RuntimeError:
                if self.compose:
@ -185,19 +198,38 @@ class GitWrapper(ScmBase):
                    copy_all(destdir, debugdir)
                raise

-        self.run_process_command(destdir)
+    def get_temp_repo_path(self, scm_root, scm_branch):
+        scm_repo = scm_root.split("/")[-1]
+        process_id = os.getpid()
+        tmp_dir = (
+            "/tmp/pungi-temp-git-repos-"
+            + str(process_id)
+            + "/"
+            + scm_repo
+            + "-"
+            + scm_branch
+        )
+        return tmp_dir
+
+    def setup_repo(self, scm_root, scm_branch):
+        tmp_dir = self.get_temp_repo_path(scm_root, scm_branch)
+        if not os.path.isdir(tmp_dir):
+            makedirs(tmp_dir)
+            self._clone(scm_root, scm_branch, tmp_dir)
+        self.run_process_command(tmp_dir)
+        return tmp_dir

    def export_dir(self, scm_root, scm_dir, target_dir, scm_branch=None):
        scm_dir = scm_dir.lstrip("/")
        scm_branch = scm_branch or "master"

-        with temp_dir() as tmp_dir:
-            self.log_debug(
-                "Exporting directory %s from git %s (branch %s)..."
-                % (scm_dir, scm_root, scm_branch)
-            )
+        self.log_debug(
+            "Exporting directory %s from git %s (branch %s)..."
+            % (scm_dir, scm_root, scm_branch)
+        )

-            self._clone(scm_root, scm_branch, tmp_dir)
+        with lock:
+            tmp_dir = self.setup_repo(scm_root, scm_branch)

            copy_all(os.path.join(tmp_dir, scm_dir), target_dir)

@ -205,15 +237,15 @@ class GitWrapper(ScmBase):
        scm_file = scm_file.lstrip("/")
        scm_branch = scm_branch or "master"

-        with temp_dir() as tmp_dir:
-            target_path = os.path.join(target_dir, os.path.basename(scm_file))
+        target_path = os.path.join(target_dir, os.path.basename(scm_file))

-            self.log_debug(
-                "Exporting file %s from git %s (branch %s)..."
-                % (scm_file, scm_root, scm_branch)
-            )
+        self.log_debug(
+            "Exporting file %s from git %s (branch %s)..."
+            % (scm_file, scm_root, scm_branch)
+        )

-            self._clone(scm_root, scm_branch, tmp_dir)
+        with lock:
+            tmp_dir = self.setup_repo(scm_root, scm_branch)

            makedirs(target_dir)
            shutil.copy2(os.path.join(tmp_dir, scm_file), target_path)
@ -361,15 +393,19 @@ def get_file_from_scm(scm_dict, target_path, compose=None):
        scm_file = os.path.abspath(scm_dict)
        scm_branch = None
        command = None
+        options = {}
    else:
        scm_type = scm_dict["scm"]
        scm_repo = scm_dict["repo"]
        scm_file = scm_dict["file"]
        scm_branch = scm_dict.get("branch", None)
        command = scm_dict.get("command")
+        options = scm_dict.get("options", {})

    logger = compose._logger if compose else None
-    scm = _get_wrapper(scm_type, logger=logger, command=command, compose=compose)
+    scm = _get_wrapper(
+        scm_type, logger=logger, command=command, compose=compose, options=options
+    )

    files_copied = []
    for i in force_list(scm_file):
@ -450,15 +486,19 @@ def get_dir_from_scm(scm_dict, target_path, compose=None):
        scm_dir = os.path.abspath(scm_dict)
        scm_branch = None
        command = None
+        options = {}
    else:
        scm_type = scm_dict["scm"]
        scm_repo = scm_dict.get("repo", None)
        scm_dir = scm_dict["dir"]
        scm_branch = scm_dict.get("branch", None)
        command = scm_dict.get("command")
+        options = scm_dict.get("options", {})

    logger = compose._logger if compose else None
-    scm = _get_wrapper(scm_type, logger=logger, command=command, compose=compose)
+    scm = _get_wrapper(
+        scm_type, logger=logger, command=command, compose=compose, options=options
+    )

    with temp_dir(prefix="scm_checkout_") as tmp_dir:
        scm.export_dir(scm_repo, scm_dir, scm_branch=scm_branch, target_dir=tmp_dir)
--- a/pungi/wrappers/variants.py
+++ b/pungi/wrappers/variants.py
@ -276,7 +276,6 @@ class Variant(object):
        modules=None,
        modular_koji_tags=None,
    ):
-
        environments = environments or []
        buildinstallpackages = buildinstallpackages or []

--- a/pungi_utils/orchestrator.py
+++ b/pungi_utils/orchestrator.py
@ -1,705 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import print_function
-
-import argparse
-import atexit
-import errno
-import json
-import logging
-import os
-import re
-import shutil
-import subprocess
-import sys
-import tempfile
-import time
-import threading
-from collections import namedtuple
-
-import kobo.conf
-import kobo.log
-import productmd
-from kobo import shortcuts
-from six.moves import configparser, shlex_quote
-
-import pungi.util
-from pungi.compose import get_compose_dir
-from pungi.linker import linker_pool
-from pungi.phases.pkgset.sources.source_koji import get_koji_event_raw
-from pungi.util import find_old_compose, parse_koji_event, temp_dir
-from pungi.wrappers.kojiwrapper import KojiWrapper
-
-
-Config = namedtuple(
-    "Config",
-    [
-        # Path to directory with the compose
-        "target",
-        "compose_type",
-        "label",
-        # Path to the selected old compose that will be reused
-        "old_compose",
-        # Path to directory with config file copies
-        "config_dir",
-        # Which koji event to use (if any)
-        "event",
-        # Additional arguments to pungi-koji executable
-        "extra_args",
-    ],
-)
-
-log = logging.getLogger(__name__)
-
-
-class Status(object):
-    # Ready to start
-    READY = "READY"
-    # Waiting for dependencies to finish.
-    WAITING = "WAITING"
-    # Part is currently running
-    STARTED = "STARTED"
-    # A dependency failed, this one will never start.
-    BLOCKED = "BLOCKED"
-
-
-class ComposePart(object):
-    def __init__(self, name, config, just_phase=[], skip_phase=[], dependencies=[]):
-        self.name = name
-        self.config = config
-        self.status = Status.WAITING if dependencies else Status.READY
-        self.just_phase = just_phase
-        self.skip_phase = skip_phase
-        self.blocked_on = set(dependencies)
-        self.depends_on = set(dependencies)
-        self.path = None
-        self.log_file = None
-        self.failable = False
-
-    def __str__(self):
-        return self.name
-
-    def __repr__(self):
-        return (
-            "ComposePart({0.name!r},"
-            " {0.config!r},"
-            " {0.status!r},"
-            " just_phase={0.just_phase!r},"
-            " skip_phase={0.skip_phase!r},"
-            " dependencies={0.depends_on!r})"
-        ).format(self)
-
-    def refresh_status(self):
-        """Refresh status of this part with the result of the compose. This
-        should only be called once the compose finished.
-        """
-        try:
-            with open(os.path.join(self.path, "STATUS")) as fh:
-                self.status = fh.read().strip()
-        except IOError as exc:
-            log.error("Failed to update status of %s: %s", self.name, exc)
-            log.error("Assuming %s is DOOMED", self.name)
-            self.status = "DOOMED"
-
-    def is_finished(self):
-        return "FINISHED" in self.status
-
-    def unblock_on(self, finished_part):
-        """Update set of blockers for this part. If it's empty, mark us as ready."""
-        self.blocked_on.discard(finished_part)
-        if self.status == Status.WAITING and not self.blocked_on:
-            log.debug("%s is ready to start", self)
-            self.status = Status.READY
-
-    def setup_start(self, global_config, parts):
-        substitutions = dict(
-            ("part-%s" % name, p.path) for name, p in parts.items() if p.is_finished()
-        )
-        substitutions["configdir"] = global_config.config_dir
-
-        config = pungi.util.load_config(self.config)
-
-        for f in config.opened_files:
-            # apply substitutions
-            fill_in_config_file(f, substitutions)
-
-        self.status = Status.STARTED
-        self.path = get_compose_dir(
-            os.path.join(global_config.target, "parts"),
-            config,
-            compose_type=global_config.compose_type,
-            compose_label=global_config.label,
-        )
-        self.log_file = os.path.join(global_config.target, "logs", "%s.log" % self.name)
-        log.info("Starting %s in %s", self.name, self.path)
-
-    def get_cmd(self, global_config):
-        cmd = ["pungi-koji", "--config", self.config, "--compose-dir", self.path]
-        cmd.append("--%s" % global_config.compose_type)
-        if global_config.label:
-            cmd.extend(["--label", global_config.label])
-        for phase in self.just_phase:
-            cmd.extend(["--just-phase", phase])
-        for phase in self.skip_phase:
-            cmd.extend(["--skip-phase", phase])
-        if global_config.old_compose:
-            cmd.extend(
-                ["--old-compose", os.path.join(global_config.old_compose, "parts")]
-            )
-        if global_config.event:
-            cmd.extend(["--koji-event", str(global_config.event)])
-        if global_config.extra_args:
-            cmd.extend(global_config.extra_args)
-        cmd.extend(["--no-latest-link"])
-        return cmd
-
-    @classmethod
-    def from_config(cls, config, section, config_dir):
-        part = cls(
-            name=section,
-            config=os.path.join(config_dir, config.get(section, "config")),
-            just_phase=_safe_get_list(config, section, "just_phase", []),
-            skip_phase=_safe_get_list(config, section, "skip_phase", []),
-            dependencies=_safe_get_list(config, section, "depends_on", []),
-        )
-        if config.has_option(section, "failable"):
-            part.failable = config.getboolean(section, "failable")
-        return part
-
-
-def _safe_get_list(config, section, option, default=None):
-    """Get a value from config parser. The result is split into a list on
-    commas or spaces, and `default` is returned if the key does not exist.
-    """
-    if config.has_option(section, option):
-        value = config.get(section, option)
-        return [x.strip() for x in re.split(r"[, ]+", value) if x]
-    return default
-
-
-def fill_in_config_file(fp, substs):
-    """Templating function. It works with Jinja2 style placeholders such as
-    {{foo}}. Whitespace around the key name is fine. The file is modified in place.
-
-    :param fp string: path to the file to process
-    :param substs dict: a mapping for values to put into the file
-    """
-
-    def repl(match):
-        try:
-            return substs[match.group(1)]
-        except KeyError as exc:
-            raise RuntimeError(
-                "Unknown placeholder %s in %s" % (exc, os.path.basename(fp))
-            )
-
-    with open(fp, "r") as f:
-        contents = re.sub(r"{{ *([a-zA-Z-_]+) *}}", repl, f.read())
-    with open(fp, "w") as f:
-        f.write(contents)
-
-
-def start_part(global_config, parts, part):
-    part.setup_start(global_config, parts)
-    fh = open(part.log_file, "w")
-    cmd = part.get_cmd(global_config)
-    log.debug("Running command %r", " ".join(shlex_quote(x) for x in cmd))
-    return subprocess.Popen(cmd, stdout=fh, stderr=subprocess.STDOUT)
-
-
-def handle_finished(global_config, linker, parts, proc, finished_part):
-    finished_part.refresh_status()
-    log.info("%s finished with status %s", finished_part, finished_part.status)
-    if proc.returncode == 0:
-        # Success, unblock other parts...
-        for part in parts.values():
-            part.unblock_on(finished_part.name)
-        # ...and link the results into final destination.
-        copy_part(global_config, linker, finished_part)
-        update_metadata(global_config, finished_part)
-    else:
-        # Failure, other stuff may be blocked.
-        log.info("See details in %s", finished_part.log_file)
-        block_on(parts, finished_part.name)
-
-
-def copy_part(global_config, linker, part):
-    c = productmd.Compose(part.path)
-    for variant in c.info.variants:
-        data_path = os.path.join(part.path, "compose", variant)
-        link = os.path.join(global_config.target, "compose", variant)
-        log.info("Hardlinking content %s -> %s", data_path, link)
-        hardlink_dir(linker, data_path, link)
-
-
-def hardlink_dir(linker, srcdir, dstdir):
-    for root, dirs, files in os.walk(srcdir):
-        root = os.path.relpath(root, srcdir)
-        for f in files:
-            src = os.path.normpath(os.path.join(srcdir, root, f))
-            dst = os.path.normpath(os.path.join(dstdir, root, f))
-            linker.queue_put((src, dst))
-
-
-def update_metadata(global_config, part):
-    part_metadata_dir = os.path.join(part.path, "compose", "metadata")
-    final_metadata_dir = os.path.join(global_config.target, "compose", "metadata")
-    for f in os.listdir(part_metadata_dir):
-        # Load the metadata
-        with open(os.path.join(part_metadata_dir, f)) as fh:
-            part_metadata = json.load(fh)
-        final_metadata = os.path.join(final_metadata_dir, f)
-        if os.path.exists(final_metadata):
-            # We already have this file, will need to merge.
-            merge_metadata(final_metadata, part_metadata)
-        else:
-            # A new file, just copy it.
-            copy_metadata(global_config, final_metadata, part_metadata)
-
-
-def copy_metadata(global_config, final_metadata, source):
-    """Copy file to final location, but update compose information."""
-    with open(
-        os.path.join(global_config.target, "compose/metadata/composeinfo.json")
-    ) as f:
-        composeinfo = json.load(f)
-    try:
-        source["payload"]["compose"].update(composeinfo["payload"]["compose"])
-    except KeyError:
-        # No [payload][compose], probably OSBS metadata
-        pass
-    with open(final_metadata, "w") as f:
-        json.dump(source, f, indent=2, sort_keys=True)
-
-
-def merge_metadata(final_metadata, source):
-    with open(final_metadata) as f:
-        metadata = json.load(f)
-
-    try:
-        key = {
-            "productmd.composeinfo": "variants",
-            "productmd.modules": "modules",
-            "productmd.images": "images",
-            "productmd.rpms": "rpms",
-        }[source["header"]["type"]]
-        # TODO what if multiple parts create images for the same variant
-        metadata["payload"][key].update(source["payload"][key])
-    except KeyError:
-        # OSBS metadata, merge whole file
-        metadata.update(source)
-    with open(final_metadata, "w") as f:
-        json.dump(metadata, f, indent=2, sort_keys=True)
-
-
-def block_on(parts, name):
-    """Part ``name`` failed, mark everything depending on it as blocked."""
-    for part in parts.values():
-        if name in part.blocked_on:
-            log.warning("%s is blocked now and will not run", part)
-            part.status = Status.BLOCKED
-            block_on(parts, part.name)
-
-
-def check_finished_processes(processes):
-    """Walk through all active processes and check if something finished."""
-    for proc in processes.keys():
-        proc.poll()
-        if proc.returncode is not None:
-            yield proc, processes[proc]
-
-
-def run_all(global_config, parts):
-    # Mapping subprocess.Popen -> ComposePart
-    processes = dict()
-    remaining = set(p.name for p in parts.values() if not p.is_finished())
-
-    with linker_pool("hardlink") as linker:
-        while remaining or processes:
-            update_status(global_config, parts)
-
-            for proc, part in check_finished_processes(processes):
-                del processes[proc]
-                handle_finished(global_config, linker, parts, proc, part)
-
-            # Start new available processes.
-            for name in list(remaining):
-                part = parts[name]
-                # Start all ready parts
-                if part.status == Status.READY:
-                    remaining.remove(name)
-                    processes[start_part(global_config, parts, part)] = part
-                # Remove blocked parts from todo list
-                elif part.status == Status.BLOCKED:
-                    remaining.remove(part.name)
-
-            # Wait for any child process to finish if there is any.
-            if processes:
-                pid, reason = os.wait()
-                for proc in processes.keys():
-                    # Set the return code for process that we caught by os.wait().
-                    # Calling poll() on it would not set the return code properly
-                    # since the value was already consumed by os.wait().
-                    if proc.pid == pid:
-                        proc.returncode = (reason >> 8) & 0xFF
-
-        log.info("Waiting for linking to finish...")
-    return update_status(global_config, parts)
-
-
-def get_target_dir(config, compose_info, label, reldir=""):
-    """Find directory where this compose will be.
-
-    @param reldir: if target path in config is relative, it will be resolved
-                   against this directory
-    """
-    dir = os.path.realpath(os.path.join(reldir, config.get("general", "target")))
-    target_dir = get_compose_dir(
-        dir,
-        compose_info,
-        compose_type=config.get("general", "compose_type"),
-        compose_label=label,
-    )
-    return target_dir
-
-
-def setup_logging(debug=False):
-    FORMAT = "%(asctime)s: %(levelname)s: %(message)s"
-    level = logging.DEBUG if debug else logging.INFO
-    kobo.log.add_stderr_logger(log, log_level=level, format=FORMAT)
-    log.setLevel(level)
-
-
-def compute_status(statuses):
-    if any(map(lambda x: x[0] in ("STARTED", "WAITING"), statuses)):
-        # If there is anything still running or waiting to start, the whole is
-        # still running.
-        return "STARTED"
-    elif any(map(lambda x: x[0] in ("DOOMED", "BLOCKED") and not x[1], statuses)):
-        # If any required part is doomed or blocked, the whole is doomed
-        return "DOOMED"
-    elif all(map(lambda x: x[0] == "FINISHED", statuses)):
-        # If all parts are complete, the whole is complete
-        return "FINISHED"
-    else:
-        return "FINISHED_INCOMPLETE"
-
-
-def update_status(global_config, parts):
-    log.debug("Updating status metadata")
-    metadata = {}
-    statuses = set()
-    for part in parts.values():
-        metadata[part.name] = {"status": part.status, "path": part.path}
-        statuses.add((part.status, part.failable))
-    metadata_path = os.path.join(
-        global_config.target, "compose", "metadata", "parts.json"
-    )
-    with open(metadata_path, "w") as fh:
-        json.dump(metadata, fh, indent=2, sort_keys=True, separators=(",", ": "))
-
-    status = compute_status(statuses)
-    log.info("Overall status is %s", status)
-    with open(os.path.join(global_config.target, "STATUS"), "w") as fh:
-        fh.write(status)
-
-    return status != "DOOMED"
-
-
-def prepare_compose_dir(config, args, main_config_file, compose_info):
-    if not hasattr(args, "compose_path"):
-        # Creating a brand new compose
-        target_dir = get_target_dir(
-            config, compose_info, args.label, reldir=os.path.dirname(main_config_file)
-        )
-        for dir in ("logs", "parts", "compose/metadata", "work/global"):
-            try:
-                os.makedirs(os.path.join(target_dir, dir))
-            except OSError as exc:
-                if exc.errno != errno.EEXIST:
-                    raise
-        with open(os.path.join(target_dir, "STATUS"), "w") as fh:
-            fh.write("STARTED")
-        # Copy initial composeinfo for new compose
-        shutil.copy(
-            os.path.join(target_dir, "work/global/composeinfo-base.json"),
-            os.path.join(target_dir, "compose/metadata/composeinfo.json"),
-        )
-    else:
-        # Restarting a particular compose
-        target_dir = args.compose_path
-
-    return target_dir
-
-
-def load_parts_metadata(global_config):
-    parts_metadata = os.path.join(global_config.target, "compose/metadata/parts.json")
-    with open(parts_metadata) as f:
-        return json.load(f)
-
-
-def setup_for_restart(global_config, parts, to_restart):
-    has_stuff_to_do = False
-    metadata = load_parts_metadata(global_config)
-    for key in metadata:
-        # Update state to match what is on disk
-        log.debug(
-            "Reusing %s (%s) from %s",
-            key,
-            metadata[key]["status"],
-            metadata[key]["path"],
-        )
-        parts[key].status = metadata[key]["status"]
-        parts[key].path = metadata[key]["path"]
-    for key in to_restart:
-        # Set restarted parts to run again
-        parts[key].status = Status.WAITING
-        parts[key].path = None
-
-    for key in to_restart:
-        # Remove blockers that are already finished
-        for blocker in list(parts[key].blocked_on):
-            if parts[blocker].is_finished():
-                parts[key].blocked_on.discard(blocker)
-        if not parts[key].blocked_on:
-            log.debug("Part %s in not blocked", key)
-            # Nothing blocks it; let's go
-            parts[key].status = Status.READY
-            has_stuff_to_do = True
-
-    if not has_stuff_to_do:
-        raise RuntimeError("All restarted parts are blocked. Nothing to do.")
-
-
-def run_kinit(config):
-    if not config.getboolean("general", "kerberos"):
-        return
-
-    keytab = config.get("general", "kerberos_keytab")
-    principal = config.get("general", "kerberos_principal")
-
-    fd, fname = tempfile.mkstemp(prefix="krb5cc_pungi-orchestrate_")
-    os.close(fd)
-    os.environ["KRB5CCNAME"] = fname
-    shortcuts.run(["kinit", "-k", "-t", keytab, principal])
-    log.debug("Created a kerberos ticket for %s", principal)
-
-    atexit.register(os.remove, fname)
-
-
-def get_compose_data(compose_path):
-    try:
-        compose = productmd.compose.Compose(compose_path)
-        data = {
-            "compose_id": compose.info.compose.id,
-            "compose_date": compose.info.compose.date,
-            "compose_type": compose.info.compose.type,
-            "compose_respin": str(compose.info.compose.respin),
-            "compose_label": compose.info.compose.label,
-            "release_id": compose.info.release_id,
-            "release_name": compose.info.release.name,
-            "release_short": compose.info.release.short,
-            "release_version": compose.info.release.version,
-            "release_type": compose.info.release.type,
-            "release_is_layered": compose.info.release.is_layered,
-        }
-        if compose.info.release.is_layered:
-            data.update(
-                {
-                    "base_product_name": compose.info.base_product.name,
-                    "base_product_short": compose.info.base_product.short,
-                    "base_product_version": compose.info.base_product.version,
-                    "base_product_type": compose.info.base_product.type,
-                }
-            )
-        return data
-    except Exception:
-        return {}
-
-
-def get_script_env(compose_path):
-    env = os.environ.copy()
-    env["COMPOSE_PATH"] = compose_path
-    for key, value in get_compose_data(compose_path).items():
-        if isinstance(value, bool):
-            env[key.upper()] = "YES" if value else ""
-        else:
-            env[key.upper()] = str(value) if value else ""
-    return env
-
-
-def run_scripts(prefix, compose_dir, scripts):
-    env = get_script_env(compose_dir)
-    for idx, script in enumerate(scripts.strip().splitlines()):
-        command = script.strip()
-        logfile = os.path.join(compose_dir, "logs", "%s%s.log" % (prefix, idx))
-        log.debug("Running command: %r", command)
-        log.debug("See output in %s", logfile)
-        shortcuts.run(command, env=env, logfile=logfile)
-
-
-def try_translate_path(parts, path):
-    translation = []
-    for part in parts.values():
-        conf = pungi.util.load_config(part.config)
-        translation.extend(conf.get("translate_paths", []))
-    return pungi.util.translate_path_raw(translation, path)
-
-
-def send_notification(compose_dir, command, parts):
-    if not command:
-        return
-    from pungi.notifier import PungiNotifier
-
-    data = get_compose_data(compose_dir)
-    data["location"] = try_translate_path(parts, compose_dir)
-    notifier = PungiNotifier([command])
-    with open(os.path.join(compose_dir, "STATUS")) as f:
-        status = f.read().strip()
-    notifier.send("status-change", workdir=compose_dir, status=status, **data)
-
-
-def setup_progress_monitor(global_config, parts):
-    """Update configuration so that each part send notifications about its
-    progress to the orchestrator.
-
-    There is a file to which the notification is written. The orchestrator is
-    reading it and mapping the entries to particular parts. The path to this
-    file is stored in an environment variable.
-    """
-    tmp_file = tempfile.NamedTemporaryFile(prefix="pungi-progress-monitor_")
-    os.environ["_PUNGI_ORCHESTRATOR_PROGRESS_MONITOR"] = tmp_file.name
-    atexit.register(os.remove, tmp_file.name)
-
-    global_config.extra_args.append(
-        "--notification-script=pungi-notification-report-progress"
-    )
-
-    def reader():
-        while True:
-            line = tmp_file.readline()
-            if not line:
-                time.sleep(0.1)
-                continue
-            path, msg = line.split(":", 1)
-            for part in parts:
-                if parts[part].path == os.path.dirname(path):
-                    log.debug("%s: %s", part, msg.strip())
-                    break
-
-    monitor = threading.Thread(target=reader)
-    monitor.daemon = True
-    monitor.start()
-
-
-def run(work_dir, main_config_file, args):
-    config_dir = os.path.join(work_dir, "config")
-    shutil.copytree(os.path.dirname(main_config_file), config_dir)
-
-    # Read main config
-    parser = configparser.RawConfigParser(
-        defaults={
-            "kerberos": "false",
-            "pre_compose_script": "",
-            "post_compose_script": "",
-            "notification_script": "",
-        }
-    )
-    parser.read(main_config_file)
-
-    # Create kerberos ticket
-    run_kinit(parser)
-
-    compose_info = dict(parser.items("general"))
-    compose_type = parser.get("general", "compose_type")
-
-    target_dir = prepare_compose_dir(parser, args, main_config_file, compose_info)
-    kobo.log.add_file_logger(log, os.path.join(target_dir, "logs", "orchestrator.log"))
-    log.info("Composing %s", target_dir)
-
-    run_scripts("pre_compose_", target_dir, parser.get("general", "pre_compose_script"))
-
-    old_compose = find_old_compose(
-        os.path.dirname(target_dir),
-        compose_info["release_short"],
-        compose_info["release_version"],
-        "",
-    )
-    if old_compose:
-        log.info("Reusing old compose %s", old_compose)
-
-    global_config = Config(
-        target=target_dir,
-        compose_type=compose_type,
-        label=args.label,
-        old_compose=old_compose,
-        config_dir=os.path.dirname(main_config_file),
-        event=args.koji_event,
-        extra_args=_safe_get_list(parser, "general", "extra_args"),
-    )
-
-    if not global_config.event and parser.has_option("general", "koji_profile"):
-        koji_wrapper = KojiWrapper(parser.get("general", "koji_profile"))
-        event_file = os.path.join(global_config.target, "work/global/koji-event")
-        result = get_koji_event_raw(koji_wrapper, None, event_file)
-        global_config = global_config._replace(event=result["id"])
-
-    parts = {}
-    for section in parser.sections():
-        if section == "general":
-            continue
-        parts[section] = ComposePart.from_config(parser, section, config_dir)
-
-    if hasattr(args, "part"):
-        setup_for_restart(global_config, parts, args.part)
-
-    setup_progress_monitor(global_config, parts)
-
-    send_notification(target_dir, parser.get("general", "notification_script"), parts)
-
-    retcode = run_all(global_config, parts)
-
-    if retcode:
-        # Only run the script if we are not doomed.
-        run_scripts(
-            "post_compose_", target_dir, parser.get("general", "post_compose_script")
-        )
-
-    send_notification(target_dir, parser.get("general", "notification_script"), parts)
-
-    return retcode
-
-
-def parse_args(argv):
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--debug", action="store_true")
-    parser.add_argument("--koji-event", metavar="ID", type=parse_koji_event)
-    subparsers = parser.add_subparsers()
-    start = subparsers.add_parser("start")
-    start.add_argument("config", metavar="CONFIG")
-    start.add_argument("--label")
-
-    restart = subparsers.add_parser("restart")
-    restart.add_argument("config", metavar="CONFIG")
-    restart.add_argument("compose_path", metavar="COMPOSE_PATH")
-    restart.add_argument(
-        "part", metavar="PART", nargs="*", help="which parts to restart"
-    )
-    restart.add_argument("--label")
-
-    return parser.parse_args(argv)
-
-
-def main(argv=None):
-    args = parse_args(argv)
-    setup_logging(args.debug)
-
-    main_config_file = os.path.abspath(args.config)
-
-    with temp_dir() as work_dir:
-        try:
-            if not run(work_dir, main_config_file, args):
-                sys.exit(1)
-        except Exception:
-            log.exception("Unhandled exception!")
-            sys.exit(1)
--- a/pungi_utils/unified_isos.py
+++ b/pungi_utils/unified_isos.py
@ -148,6 +148,15 @@ class UnifiedISO(object):
                    new_path = os.path.join(self.temp_dir, "trees", arch, old_relpath)

                makedirs(os.path.dirname(new_path))
+                # Resolve symlinks to external files. Symlinks within the
+                # provided `dir` are kept.
+                if os.path.islink(old_path):
+                    real_path = os.readlink(old_path)
+                    abspath = os.path.normpath(
+                        os.path.join(os.path.dirname(old_path), real_path)
+                    )
+                    if not abspath.startswith(dir):
+                        old_path = real_path
                try:
                    self.linker.link(old_path, new_path)
                except OSError as exc:
--- a/requirements.txt
+++ b/requirements.txt
@ -1,8 +1,7 @@
 # Some packages must be installed via dnf/yum first, see doc/contributing.rst
-dict.sorted
 dogpile.cache
-fedmsg
-funcsigs
+flufl.lock ; python_version >= '3.0'
+flufl.lock < 3.0 ; python_version <= '2.7'
 jsonschema
 kobo
 koji
@ -13,4 +12,4 @@ ordered_set
 productmd
 pykickstart
 python-multilib
-urlgrabber
+urlgrabber ; python_version < '3.0'
--- a/setup.cfg
+++ b/setup.cfg
@ -0,0 +1,2 @@
+[sdist]
+formats=bztar
--- a/setup.py
+++ b/setup.py
@ -5,14 +5,9 @@
 import os
 import glob

-import distutils.command.sdist
 from setuptools import setup


-# override default tarball format with bzip2
-distutils.command.sdist.sdist.default_format = {"posix": "bztar"}
-
-
 # recursively scan for python modules to be included
 package_root_dirs = ["pungi", "pungi_utils"]
 packages = set()
@ -25,7 +20,7 @@ packages = sorted(packages)

 setup(
    name="pungi",
-    version="4.3.6",
+    version="4.7.0",
    description="Distribution compose tool",
    url="https://pagure.io/pungi",
    author="Dennis Gilmore",
@ -41,16 +36,17 @@ setup(
            "pungi-patch-iso = pungi.scripts.patch_iso:cli_main",
            "pungi-make-ostree = pungi.ostree:main",
            "pungi-notification-report-progress = pungi.scripts.report_progress:main",
-            "pungi-orchestrate = pungi_utils.orchestrator:main",
            "pungi-wait-for-signed-ostree-handler = pungi.scripts.wait_for_signed_ostree_handler:main",  # noqa: E501
            "pungi-koji = pungi.scripts.pungi_koji:cli_main",
            "pungi-gather = pungi.scripts.pungi_gather:cli_main",
            "pungi-config-dump = pungi.scripts.config_dump:cli_main",
            "pungi-config-validate = pungi.scripts.config_validate:cli_main",
+            "pungi-cache-cleanup = pungi.scripts.cache_cleanup:main",
        ]
    },
    scripts=["contrib/yum-dnf-compare/pungi-compare-depsolving"],
    data_files=[
+        ("/usr/lib/tmpfiles.d", glob.glob("contrib/tmpfiles.d/*.conf")),
        ("/usr/share/pungi", glob.glob("share/*.xsl")),
        ("/usr/share/pungi", glob.glob("share/*.ks")),
        ("/usr/share/pungi", glob.glob("share/*.dtd")),
@ -66,5 +62,5 @@ setup(
        "dogpile.cache",
    ],
    extras_require={':python_version=="2.7"': ["enum34", "lockfile"]},
-    tests_require=["mock", "pytest", "pytest-cov"],
+    tests_require=["pytest", "pytest-cov"],
 )
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -1,5 +1,5 @@
-mock
+mock; python_version < '3.3'
 parameterized
 pytest
 pytest-cov
-unittest2
+unittest2; python_version < '3.0'
--- a/tests/Dockerfile-test
+++ b/tests/Dockerfile-test
@ -1,4 +1,4 @@
-FROM fedora:33
+FROM registry.fedoraproject.org/fedora:latest
 LABEL \
    name="Pungi test" \
    description="Run tests using tox with Python 3" \
--- a/tests/data/dummy-comps.xml
+++ b/tests/data/dummy-comps.xml
@ -108,6 +108,7 @@
      <groupid>core</groupid>
    </grouplist>
    <optionlist>
+      <groupid arch="x86_64">standard</groupid>
    </optionlist>
  </environment>

--- a/tests/helpers.py
+++ b/tests/helpers.py
@ -2,12 +2,16 @@

 import difflib
 import errno
+import hashlib
 import os
 import shutil
 import tempfile
 from collections import defaultdict

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 from kobo.rpmlib import parse_nvr

@ -21,6 +25,15 @@ from pungi import paths, checks
 from pungi.module_util import Modulemd


+GIT_WITH_CREDS = [
+    "git",
+    "-c",
+    "credential.useHttpPath=true",
+    "-c",
+    "credential.helper=!ch",
+]
+
+
 class BaseTestCase(unittest.TestCase):
    def assertFilesEqual(self, fn1, fn2):
        with open(fn1, "rb") as f1:
@ -158,6 +171,20 @@ class IterableMock(mock.Mock):
        return iter([])


+class FSKojiDownloader(object):
+    """Mock for KojiDownloadProxy that checks provided path."""
+
+    def get_file(self, path, validator=None):
+        return path if os.path.isfile(path) else None
+
+
+class DummyKojiDownloader(object):
+    """Mock for KojiDownloadProxy that always finds the file in original location."""
+
+    def get_file(self, path, validator=None):
+        return path
+
+
 class DummyCompose(object):
    def __init__(self, topdir, config):
        self.supported = True
@ -232,6 +259,8 @@ class DummyCompose(object):
        self.cache_region = None
        self.containers_metadata = {}
        self.load_old_compose_config = mock.Mock(return_value=None)
+        self.koji_downloader = DummyKojiDownloader()
+        self.koji_downloader.path_prefix = "/prefix"

    def setup_optional(self):
        self.all_variants["Server-optional"] = MockVariant(
@ -272,7 +301,7 @@ class DummyCompose(object):
        return tempfile.mkdtemp(suffix=suffix, prefix=prefix, dir=self.topdir)


-def touch(path, content=None):
+def touch(path, content=None, mode=None):
    """Helper utility that creates an dummy file in given location. Directories
    will be created."""
    content = content or (path + "\n")
@ -284,6 +313,8 @@ def touch(path, content=None):
        content = content.encode()
    with open(path, "wb") as f:
        f.write(content)
+    if mode:
+        os.chmod(path, mode)
    return path


@ -334,3 +365,9 @@ def fake_run_in_threads(func, params, threads=None):
    """Like run_in_threads from Kobo, but actually runs tasks serially."""
    for num, param in enumerate(params):
        func(None, param, num)
+
+
+def hash_string(alg, s):
+    m = hashlib.new(alg)
+    m.update(s.encode("utf-8"))
+    return m.hexdigest()
--- a/tests/test_arch.py
+++ b/tests/test_arch.py
@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import unittest

 from pungi.arch import (
--- a/tests/test_arguments.py
+++ b/tests/test_arguments.py
@ -1,4 +1,7 @@
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 try:
    import unittest2 as unittest
--- a/tests/test_buildinstall.py
+++ b/tests/test_buildinstall.py
@ -6,7 +6,10 @@ try:
 except ImportError:
    import unittest

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 from copy import copy
 from six.moves import StringIO
@ -254,6 +257,7 @@ class TestBuildinstallPhase(PungiTestCase):
    def test_starts_threads_for_each_cmd_with_lorax_koji_plugin(
        self, get_volid, poolCls
    ):
+        topurl = "https://example.com/composes/"
        compose = BuildInstallCompose(
            self.topdir,
            {
@ -264,6 +268,7 @@ class TestBuildinstallPhase(PungiTestCase):
                "buildinstall_method": "lorax",
                "lorax_use_koji_plugin": True,
                "disc_types": {"dvd": "DVD"},
+                "translate_paths": [(self.topdir, topurl)],
            },
        )

@ -280,9 +285,9 @@ class TestBuildinstallPhase(PungiTestCase):
                "version": "1",
                "release": "1",
                "sources": [
-                    self.topdir + "/work/amd64/repo/p1",
-                    self.topdir + "/work/amd64/repo/p2",
-                    self.topdir + "/work/amd64/comps_repo_Server",
+                    topurl + "work/amd64/repo/p1",
+                    topurl + "work/amd64/repo/p2",
+                    topurl + "work/amd64/comps_repo_Server",
                ],
                "variant": "Server",
                "installpkgs": ["bash", "vim"],
@ -299,7 +304,6 @@ class TestBuildinstallPhase(PungiTestCase):
                "rootfs-size": None,
                "dracut-args": [],
                "skip_branding": False,
-                "outputdir": self.topdir + "/work/amd64/buildinstall/Server",
                "squashfs_only": False,
                "configuration_file": None,
            },
@ -308,9 +312,9 @@ class TestBuildinstallPhase(PungiTestCase):
                "version": "1",
                "release": "1",
                "sources": [
-                    self.topdir + "/work/amd64/repo/p1",
-                    self.topdir + "/work/amd64/repo/p2",
-                    self.topdir + "/work/amd64/comps_repo_Client",
+                    topurl + "work/amd64/repo/p1",
+                    topurl + "work/amd64/repo/p2",
+                    topurl + "work/amd64/comps_repo_Client",
                ],
                "variant": "Client",
                "installpkgs": [],
@ -327,7 +331,6 @@ class TestBuildinstallPhase(PungiTestCase):
                "rootfs-size": None,
                "dracut-args": [],
                "skip_branding": False,
-                "outputdir": self.topdir + "/work/amd64/buildinstall/Client",
                "squashfs_only": False,
                "configuration_file": None,
            },
@ -336,9 +339,9 @@ class TestBuildinstallPhase(PungiTestCase):
                "version": "1",
                "release": "1",
                "sources": [
-                    self.topdir + "/work/x86_64/repo/p1",
-                    self.topdir + "/work/x86_64/repo/p2",
-                    self.topdir + "/work/x86_64/comps_repo_Server",
+                    topurl + "work/x86_64/repo/p1",
+                    topurl + "work/x86_64/repo/p2",
+                    topurl + "work/x86_64/comps_repo_Server",
                ],
                "variant": "Server",
                "installpkgs": ["bash", "vim"],
@ -355,7 +358,6 @@ class TestBuildinstallPhase(PungiTestCase):
                "rootfs-size": None,
                "dracut-args": [],
                "skip_branding": False,
-                "outputdir": self.topdir + "/work/x86_64/buildinstall/Server",
                "squashfs_only": False,
                "configuration_file": None,
            },
@ -473,70 +475,6 @@ class TestBuildinstallPhase(PungiTestCase):
            ],
        )

-    @mock.patch("pungi.phases.buildinstall.ThreadPool")
-    @mock.patch("pungi.phases.buildinstall.LoraxWrapper")
-    @mock.patch("pungi.phases.buildinstall.get_volid")
-    def test_starts_threads_for_each_cmd_with_buildinstall(
-        self, get_volid, loraxCls, poolCls
-    ):
-        compose = BuildInstallCompose(
-            self.topdir,
-            {
-                "bootable": True,
-                "release_name": "Test",
-                "release_short": "t",
-                "release_version": "1",
-                "buildinstall_method": "buildinstall",
-                "disc_types": {"dvd": "DVD"},
-            },
-        )
-
-        get_volid.return_value = "vol_id"
-
-        phase = BuildinstallPhase(compose, self._make_pkgset_phase(["p1"]))
-
-        phase.run()
-
-        # Two items added for processing in total.
-        pool = poolCls.return_value
-        self.assertEqual(2, len(pool.queue_put.mock_calls))
-
-        # Obtained correct lorax commands.
-        six.assertCountEqual(
-            self,
-            loraxCls.return_value.get_buildinstall_cmd.mock_calls,
-            [
-                mock.call(
-                    "Test",
-                    "1",
-                    "1",
-                    [self.topdir + "/work/x86_64/repo/p1"],
-                    self.topdir + "/work/x86_64/buildinstall",
-                    buildarch="x86_64",
-                    is_final=True,
-                    volid="vol_id",
-                ),
-                mock.call(
-                    "Test",
-                    "1",
-                    "1",
-                    [self.topdir + "/work/amd64/repo/p1"],
-                    self.topdir + "/work/amd64/buildinstall",
-                    buildarch="amd64",
-                    is_final=True,
-                    volid="vol_id",
-                ),
-            ],
-        )
-        six.assertCountEqual(
-            self,
-            get_volid.mock_calls,
-            [
-                mock.call(compose, "x86_64", disc_type="DVD"),
-                mock.call(compose, "amd64", disc_type="DVD"),
-            ],
-        )
-
    @mock.patch("pungi.phases.buildinstall.get_file")
    @mock.patch("pungi.phases.buildinstall.ThreadPool")
    @mock.patch("pungi.phases.buildinstall.LoraxWrapper")
@ -1209,6 +1147,7 @@ class BuildinstallThreadTestCase(PungiTestCase):
                "buildinstall_method": "lorax",
                "runroot_tag": "rrt",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "runroot_weights": {"buildinstall": 123},
            },
        )
@ -1297,9 +1236,9 @@ class BuildinstallThreadTestCase(PungiTestCase):
    @mock.patch("pungi.wrappers.kojiwrapper.KojiWrapper")
    @mock.patch("pungi.wrappers.kojiwrapper.get_buildroot_rpms")
    @mock.patch("pungi.phases.buildinstall.run")
-    @mock.patch("pungi.phases.buildinstall.move_all")
+    @mock.patch("pungi.phases.buildinstall.download_and_extract_archive")
    def test_buildinstall_thread_with_lorax_using_koji_plugin(
-        self, move_all, run, get_buildroot_rpms, KojiWrapperMock, mock_tweak, mock_link
+        self, download, run, get_buildroot_rpms, KojiWrapperMock, mock_tweak, mock_link
    ):
        compose = BuildInstallCompose(
            self.topdir,
@ -1308,6 +1247,7 @@ class BuildinstallThreadTestCase(PungiTestCase):
                "lorax_use_koji_plugin": True,
                "runroot_tag": "rrt",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "runroot_weights": {"buildinstall": 123},
            },
        )
@ -1344,9 +1284,8 @@ class BuildinstallThreadTestCase(PungiTestCase):
                    self.cmd,
                    channel=None,
                    packages=["lorax"],
-                    mounts=[self.topdir],
                    weight=123,
-                    chown_uid=os.getuid(),
+                    chown_uid=None,
                )
            ],
        )
@ -1387,150 +1326,17 @@ class BuildinstallThreadTestCase(PungiTestCase):
            [mock.call(compose, "x86_64", compose.variants["Server"], False)],
        )
        self.assertEqual(
-            move_all.call_args_list,
-            [
-                mock.call(os.path.join(destdir, "results"), destdir, rm_src_dir=True),
-                mock.call(
-                    os.path.join(destdir, "logs"),
-                    os.path.join(self.topdir, "logs/x86_64/buildinstall-Server-logs"),
-                    rm_src_dir=True,
-                ),
-            ],
-        )
-
-    @mock.patch("pungi.phases.buildinstall.link_boot_iso")
-    @mock.patch("pungi.phases.buildinstall.tweak_buildinstall")
-    @mock.patch("pungi.wrappers.kojiwrapper.KojiWrapper")
-    @mock.patch("pungi.wrappers.kojiwrapper.get_buildroot_rpms")
-    @mock.patch("pungi.phases.buildinstall.run")
-    def test_buildinstall_thread_with_buildinstall_in_runroot(
-        self, run, get_buildroot_rpms, KojiWrapperMock, mock_tweak, mock_link
-    ):
-        compose = BuildInstallCompose(
-            self.topdir,
-            {
-                "buildinstall_method": "buildinstall",
-                "runroot_tag": "rrt",
-                "koji_profile": "koji",
-            },
-        )
-
-        get_buildroot_rpms.return_value = ["bash", "zsh"]
-
-        get_runroot_cmd = KojiWrapperMock.return_value.get_runroot_cmd
-
-        run_runroot_cmd = KojiWrapperMock.return_value.run_runroot_cmd
-        run_runroot_cmd.return_value = {
-            "output": "Foo bar baz",
-            "retcode": 0,
-            "task_id": 1234,
-        }
-
-        t = BuildinstallThread(self.pool)
-
-        with mock.patch("time.sleep"):
-            pkgset_phase = self._make_pkgset_phase(["p1"])
-            t.process((compose, "amd64", None, self.cmd, pkgset_phase), 0)
-
-        destdir = os.path.join(self.topdir, "work/amd64/buildinstall")
-        self.assertEqual(
-            get_runroot_cmd.mock_calls,
-            [
-                mock.call(
-                    "rrt",
-                    "amd64",
-                    self.cmd,
-                    channel=None,
-                    use_shell=True,
-                    packages=["anaconda"],
-                    mounts=[self.topdir],
-                    weight=None,
-                    chown_paths=[destdir],
-                )
-            ],
-        )
-        self.assertEqual(
-            run_runroot_cmd.mock_calls,
-            [
-                mock.call(
-                    get_runroot_cmd.return_value,
-                    log_file=self.topdir + "/logs/amd64/buildinstall.amd64.log",
-                )
-            ],
-        )
-        with open(self.topdir + "/logs/amd64/buildinstall-RPMs.amd64.log") as f:
-            rpms = f.read().strip().split("\n")
-        six.assertCountEqual(self, rpms, ["bash", "zsh"])
-        six.assertCountEqual(self, self.pool.finished_tasks, [(None, "amd64")])
-        six.assertCountEqual(
-            self,
-            mock_tweak.call_args_list,
+            download.call_args_list,
            [
+                mock.call(compose, 1234, "results.tar.gz", destdir),
                mock.call(
                    compose,
-                    destdir,
-                    os.path.join(self.topdir, "compose", var, "amd64/os"),
-                    "amd64",
-                    var,
-                    "",
-                    "dummy-volid",
-                    self.pool.kickstart_file,
-                )
-                for var in ["Client", "Server"]
+                    1234,
+                    "logs.tar.gz",
+                    os.path.join(self.topdir, "logs/x86_64/buildinstall-Server-logs"),
+                ),
            ],
        )
-        six.assertCountEqual(
-            self,
-            mock_link.call_args_list,
-            [
-                mock.call(compose, "amd64", compose.variants["Client"], False),
-                mock.call(compose, "amd64", compose.variants["Server"], False),
-            ],
-        )
-
-    @mock.patch("pungi.wrappers.kojiwrapper.KojiWrapper")
-    @mock.patch("pungi.wrappers.kojiwrapper.get_buildroot_rpms")
-    @mock.patch("pungi.phases.buildinstall.run")
-    def test_buildinstall_fail_exit_code(
-        self, run, get_buildroot_rpms, KojiWrapperMock
-    ):
-        compose = BuildInstallCompose(
-            self.topdir,
-            {
-                "buildinstall_method": "buildinstall",
-                "runroot_tag": "rrt",
-                "koji_profile": "koji",
-                "failable_deliverables": [("^.+$", {"*": ["buildinstall"]})],
-            },
-        )
-
-        get_buildroot_rpms.return_value = ["bash", "zsh"]
-
-        run_runroot_cmd = KojiWrapperMock.return_value.run_runroot_cmd
-        run_runroot_cmd.return_value = {
-            "output": "Foo bar baz",
-            "retcode": 1,
-            "task_id": 1234,
-        }
-
-        t = BuildinstallThread(self.pool)
-
-        with mock.patch("time.sleep"):
-            pkgset_phase = self._make_pkgset_phase(["p1"])
-            t.process((compose, "x86_64", None, self.cmd, pkgset_phase), 0)
-
-        compose._logger.error.assert_has_calls(
-            [
-                mock.call(
-                    "[FAIL] Buildinstall (variant None, arch x86_64) failed, but going on anyway."  # noqa: E501
-                ),
-                mock.call(
-                    "Runroot task failed: 1234. See %s/logs/x86_64/buildinstall.x86_64.log for more details."  # noqa: E501
-                    % self.topdir
-                ),
-            ]
-        )
-        self.assertEqual(self.pool.finished_tasks, set())

    @mock.patch("pungi.wrappers.kojiwrapper.KojiWrapper")
    @mock.patch("pungi.wrappers.kojiwrapper.get_buildroot_rpms")
@ -1542,6 +1348,7 @@ class BuildinstallThreadTestCase(PungiTestCase):
                "buildinstall_method": "lorax",
                "runroot_tag": "rrt",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "failable_deliverables": [("^.+$", {"*": ["buildinstall"]})],
            },
        )
@ -1591,6 +1398,7 @@ class BuildinstallThreadTestCase(PungiTestCase):
                "buildinstall_method": "lorax",
                "runroot_tag": "rrt",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "failable_deliverables": [("^.+$", {"*": ["buildinstall"]})],
            },
        )
@ -1663,6 +1471,7 @@ class BuildinstallThreadTestCase(PungiTestCase):
                "buildinstall_method": "lorax",
                "runroot_tag": "rrt",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "failable_deliverables": [("^.+$", {"*": ["buildinstall"]})],
            },
        )
@ -1701,6 +1510,7 @@ class BuildinstallThreadTestCase(PungiTestCase):
                "buildinstall_method": "lorax",
                "runroot_tag": "rrt",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "runroot_weights": {"buildinstall": 123},
                "buildinstall_topdir": "/buildinstall_topdir",
            },
@ -1810,6 +1620,7 @@ class BuildinstallThreadTestCase(PungiTestCase):
                "buildinstall_method": "lorax",
                "runroot_tag": "rrt",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -2048,7 +1859,7 @@ class TestSymlinkIso(PungiTestCase):
        )
        self.assertEqual(iso.get_implanted_md5.mock_calls, [mock.call(tgt)])
        self.assertEqual(iso.get_manifest_cmd.mock_calls, [mock.call("image-name")])
-        self.assertEqual(iso.get_volume_id.mock_calls, [mock.call(tgt)])
+        self.assertEqual(iso.get_volume_id.mock_calls, [mock.call(tgt, None)])
        self.assertEqual(
            run.mock_calls,
            [
@ -2113,7 +1924,7 @@ class TestSymlinkIso(PungiTestCase):
        )
        self.assertEqual(iso.get_implanted_md5.mock_calls, [mock.call(tgt)])
        self.assertEqual(iso.get_manifest_cmd.mock_calls, [mock.call("image-name")])
-        self.assertEqual(iso.get_volume_id.mock_calls, [mock.call(tgt)])
+        self.assertEqual(iso.get_volume_id.mock_calls, [mock.call(tgt, None)])
        self.assertEqual(
            run.mock_calls,
            [
--- a/tests/test_checks.py
+++ b/tests/test_checks.py
@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 try:
    import unittest2 as unittest
--- a/tests/test_compose.py
+++ b/tests/test_compose.py
@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-

 import logging
-import mock
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 try:
    import unittest2 as unittest
@ -628,6 +632,7 @@ class ComposeTestCase(unittest.TestCase):
        ci_copy = dict(self.ci_json)
        ci_copy["header"]["version"] = "1.2"
        mocked_response = mock.MagicMock()
+        mocked_response.status_code = 200
        mocked_response.text = json.dumps(self.ci_json)
        mocked_requests.post.return_value = mocked_response

@ -655,6 +660,7 @@ class ComposeTestCase(unittest.TestCase):
            mocked_requests.post.assert_called_once_with(
                "https://cts.localhost.tld/api/1/composes/",
                auth=mock.ANY,
+                data=None,
                json=expected_json,
            )

@ -793,12 +799,16 @@ class TracebackTest(unittest.TestCase):
        shutil.rmtree(self.tmp_dir)
        self.patcher.stop()

-    def assertTraceback(self, filename):
+    def assertTraceback(self, filename, show_locals=True):
        self.assertTrue(
            os.path.isfile("%s/logs/global/%s.global.log" % (self.tmp_dir, filename))
        )
        self.assertEqual(
-            self.Traceback.mock_calls, [mock.call(), mock.call().get_traceback()]
+            self.Traceback.mock_calls,
+            [
+                mock.call(show_locals=show_locals),
+                mock.call(show_locals=show_locals).get_traceback(),
+            ],
        )

    def test_traceback_default(self):
@ -811,6 +821,7 @@ class TracebackTest(unittest.TestCase):


 class RetryRequestTest(unittest.TestCase):
+    @mock.patch("time.sleep", new=lambda x: x)
    @mock.patch("pungi.compose.requests")
    def test_retry_timeout(self, mocked_requests):
        mocked_requests.post.side_effect = [
@ -822,8 +833,22 @@ class RetryRequestTest(unittest.TestCase):
        self.assertEqual(
            mocked_requests.mock_calls,
            [
-                mock.call.post(url, json=None, auth=None),
-                mock.call.post(url, json=None, auth=None),
+                mock.call.post(url, data=None, json=None, auth=None),
+                mock.call.post(url, data=None, json=None, auth=None),
            ],
        )
        self.assertEqual(rv.status_code, 200)
+
+    @mock.patch("pungi.compose.requests")
+    def test_no_retry_on_client_error(self, mocked_requests):
+        mocked_requests.post.side_effect = [
+            mock.Mock(status_code=400, json=lambda: {"message": "You made a mistake"}),
+        ]
+        url = "http://locahost/api/1/composes/"
+        with self.assertRaises(RuntimeError):
+            retry_request("post", url)
+
+        self.assertEqual(
+            mocked_requests.mock_calls,
+            [mock.call.post(url, data=None, json=None, auth=None)],
+        )
--- a/tests/test_config.py
+++ b/tests/test_config.py
@ -7,7 +7,11 @@ except ImportError:
    import unittest

 import six
-import mock
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 from pungi import checks
 from tests.helpers import load_config, PKGSET_REPOS
@ -223,22 +227,6 @@ class BuildinstallConfigTestCase(ConfigTestCase):

        self.assertValidation(cfg, [])

-    def test_buildinstall_with_lorax_options(self):
-        cfg = load_config(
-            PKGSET_REPOS,
-            buildinstall_method="buildinstall",
-            lorax_options=[("^Server$", {})],
-        )
-
-        self.assertValidation(
-            cfg,
-            [
-                checks.CONFLICTS.format(
-                    "buildinstall_method", "buildinstall", "lorax_options"
-                )
-            ],
-        )
-
    def test_lorax_with_lorax_options(self):
        cfg = load_config(PKGSET_REPOS, buildinstall_method="lorax", lorax_options=[])

@ -440,7 +428,7 @@ class LiveMediaConfigTestCase(ConfigTestCase):
            live_media_version="Rawhide",
        )

-        resolve_git_url.side_effect = lambda x: x.replace("HEAD", "CAFE")
+        resolve_git_url.side_effect = lambda x, _helper: x.replace("HEAD", "CAFE")

        self.assertValidation(cfg)
        self.assertEqual(cfg["live_media_ksurl"], "git://example.com/repo.git#CAFE")
--- a/tests/test_config_validate_script.py
+++ b/tests/test_config_validate_script.py
@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-

-
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os
 import six

--- a/tests/test_createiso_phase.py
+++ b/tests/test_createiso_phase.py
@ -2,9 +2,15 @@


 import logging
-import mock
+import contextlib
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six

+import productmd
 import os

 from tests import helpers
@ -552,6 +558,7 @@ class CreateisoThreadTest(helpers.PungiTestCase):
                "release_version": "1.0",
                "runroot_tag": "f25-build",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )
        cmd = {
@ -608,7 +615,9 @@ class CreateisoThreadTest(helpers.PungiTestCase):
            iso.get_implanted_md5.call_args_list,
            [mock.call(cmd["iso_path"], logger=compose._logger)],
        )
-        self.assertEqual(iso.get_volume_id.call_args_list, [mock.call(cmd["iso_path"])])
+        self.assertEqual(
+            iso.get_volume_id.call_args_list, [mock.call(cmd["iso_path"], False)]
+        )

        self.assertEqual(len(compose.im.add.call_args_list), 1)
        args, _ = compose.im.add.call_args_list[0]
@ -633,6 +642,7 @@ class CreateisoThreadTest(helpers.PungiTestCase):
                "release_version": "1.0",
                "runroot_tag": "f25-build",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "create_jigdo": False,
                "runroot_weights": {"createiso": 123},
            },
@ -690,7 +700,9 @@ class CreateisoThreadTest(helpers.PungiTestCase):
            iso.get_implanted_md5.call_args_list,
            [mock.call(cmd["iso_path"], logger=compose._logger)],
        )
-        self.assertEqual(iso.get_volume_id.call_args_list, [mock.call(cmd["iso_path"])])
+        self.assertEqual(
+            iso.get_volume_id.call_args_list, [mock.call(cmd["iso_path"], False)]
+        )

        self.assertEqual(len(compose.im.add.call_args_list), 2)
        for args, _ in compose.im.add.call_args_list:
@ -717,6 +729,7 @@ class CreateisoThreadTest(helpers.PungiTestCase):
                "buildinstall_method": "lorax",
                "runroot_tag": "f25-build",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )
        cmd = {
@ -780,7 +793,9 @@ class CreateisoThreadTest(helpers.PungiTestCase):
            iso.get_implanted_md5.call_args_list,
            [mock.call(cmd["iso_path"], logger=compose._logger)],
        )
-        self.assertEqual(iso.get_volume_id.call_args_list, [mock.call(cmd["iso_path"])])
+        self.assertEqual(
+            iso.get_volume_id.call_args_list, [mock.call(cmd["iso_path"], False)]
+        )

        self.assertEqual(len(compose.im.add.call_args_list), 1)
        args, _ = compose.im.add.call_args_list[0]
@ -807,6 +822,7 @@ class CreateisoThreadTest(helpers.PungiTestCase):
                "release_version": "1.0",
                "runroot_tag": "f25-build",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )
        cmd = {
@ -839,6 +855,7 @@ class CreateisoThreadTest(helpers.PungiTestCase):
                "release_version": "1.0",
                "runroot_tag": "f25-build",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "failable_deliverables": [("^.*$", {"*": "iso"})],
            },
        )
@ -881,6 +898,7 @@ class CreateisoThreadTest(helpers.PungiTestCase):
                "release_version": "1.0",
                "runroot_tag": "f25-build",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "failable_deliverables": [("^.*$", {"*": "iso"})],
            },
        )
@ -958,7 +976,9 @@ class CreateisoThreadTest(helpers.PungiTestCase):
            iso.get_implanted_md5.call_args_list,
            [mock.call(cmd["iso_path"], logger=compose._logger)],
        )
-        self.assertEqual(iso.get_volume_id.call_args_list, [mock.call(cmd["iso_path"])])
+        self.assertEqual(
+            iso.get_volume_id.call_args_list, [mock.call(cmd["iso_path"], False)]
+        )

        self.assertEqual(len(compose.im.add.call_args_list), 1)
        args, _ = compose.im.add.call_args_list[0]
@ -1370,7 +1390,9 @@ class CreateisoTryReusePhaseTest(helpers.PungiTestCase):
        )

    def test_old_config_changed(self):
-        compose = helpers.DummyCompose(self.topdir, {"createiso_allow_reuse": True})
+        compose = helpers.DummyCompose(
+            self.topdir, {"createiso_allow_reuse": True, "sigkeys": ["abcdef"]}
+        )
        old_config = compose.conf.copy()
        old_config["release_version"] = "2"
        compose.load_old_compose_config.return_value = old_config
@ -1383,12 +1405,30 @@ class CreateisoTryReusePhaseTest(helpers.PungiTestCase):
            phase.try_reuse(cmd, compose.variants["Server"], "x86_64", opts)
        )

-    def test_no_old_metadata(self):
+    @mock.patch("pungi.phases.createiso.read_json_file")
+    def test_unsigned_packages_allowed(self, read_json_file):
        compose = helpers.DummyCompose(self.topdir, {"createiso_allow_reuse": True})
        compose.load_old_compose_config.return_value = compose.conf.copy()
        phase = createiso.CreateisoPhase(compose, mock.Mock())
        phase.logger = self.logger
        cmd = {"disc_num": 1, "disc_count": 1}
+
+        opts = CreateIsoOpts(volid="new-volid")
+
+        read_json_file.return_value = {"opts": {"volid": "old-volid"}}
+
+        self.assertFalse(
+            phase.try_reuse(cmd, compose.variants["Server"], "x86_64", opts)
+        )
+
+    def test_no_old_metadata(self):
+        compose = helpers.DummyCompose(
+            self.topdir, {"createiso_allow_reuse": True, "sigkeys": ["abcdef"]}
+        )
+        compose.load_old_compose_config.return_value = compose.conf.copy()
+        phase = createiso.CreateisoPhase(compose, mock.Mock())
+        phase.logger = self.logger
+        cmd = {"disc_num": 1, "disc_count": 1}
        opts = CreateIsoOpts()

        self.assertFalse(
@ -1397,7 +1437,9 @@ class CreateisoTryReusePhaseTest(helpers.PungiTestCase):

    @mock.patch("pungi.phases.createiso.read_json_file")
    def test_volume_id_differs(self, read_json_file):
-        compose = helpers.DummyCompose(self.topdir, {"createiso_allow_reuse": True})
+        compose = helpers.DummyCompose(
+            self.topdir, {"createiso_allow_reuse": True, "sigkeys": ["abcdef"]}
+        )
        compose.load_old_compose_config.return_value = compose.conf.copy()
        phase = createiso.CreateisoPhase(compose, mock.Mock())
        phase.logger = self.logger
@ -1413,7 +1455,9 @@ class CreateisoTryReusePhaseTest(helpers.PungiTestCase):

    @mock.patch("pungi.phases.createiso.read_json_file")
    def test_packages_differ(self, read_json_file):
-        compose = helpers.DummyCompose(self.topdir, {"createiso_allow_reuse": True})
+        compose = helpers.DummyCompose(
+            self.topdir, {"createiso_allow_reuse": True, "sigkeys": ["abcdef"]}
+        )
        compose.load_old_compose_config.return_value = compose.conf.copy()
        phase = createiso.CreateisoPhase(compose, mock.Mock())
        phase.logger = self.logger
@ -1435,7 +1479,9 @@ class CreateisoTryReusePhaseTest(helpers.PungiTestCase):

    @mock.patch("pungi.phases.createiso.read_json_file")
    def test_runs_perform_reuse(self, read_json_file):
-        compose = helpers.DummyCompose(self.topdir, {"createiso_allow_reuse": True})
+        compose = helpers.DummyCompose(
+            self.topdir, {"createiso_allow_reuse": True, "sigkeys": ["abcdef"]}
+        )
        compose.load_old_compose_config.return_value = compose.conf.copy()
        phase = createiso.CreateisoPhase(compose, mock.Mock())
        phase.logger = self.logger
@ -1589,3 +1635,103 @@ class ComposeConfGetIsoLevelTest(helpers.PungiTestCase):
                compose, compose.variants["Client"], "x86_64"
            ),
        )
+
+
+def mk_mount(topdir, images):
+    @contextlib.contextmanager
+    def dummy_mount(path, logger):
+        treeinfo = [
+            "[general]",
+            "family = Test",
+            "version = 1.0",
+            "arch = x86_64",
+            "variant = Server",
+            "[checksums]",
+        ]
+        for image in images:
+            helpers.touch(os.path.join(topdir, image.path), image.content)
+            treeinfo.append("%s = sha256:%s" % (image.path, image.checksum))
+        helpers.touch(os.path.join(topdir, ".treeinfo"), "\n".join(treeinfo))
+        yield topdir
+
+    return dummy_mount
+
+
+class _MockRun:
+    """This class replaces kobo.shortcuts.run and validates that the correct
+    two commands are called. The assertions can not be done after the tested
+    function finishes because it will clean up the .treeinfo file that needs to
+    be checked.
+    """
+
+    def __init__(self):
+        self.num_calls = 0
+        self.asserts = [self._assert_xorriso, self._assert_implantisomd5]
+
+    def __call__(self, cmd, logfile):
+        self.num_calls += 1
+        self.asserts.pop(0)(cmd)
+
+    def _assert_xorriso(self, cmd):
+        assert cmd[0] == "xorriso"
+        ti = productmd.TreeInfo()
+        input_iso = None
+        for i, arg in enumerate(cmd):
+            if arg == "-map":
+                ti.load(cmd[i + 1])
+            if arg == "-outdev":
+                self.temp_iso = cmd[i + 1]
+            if arg == "-indev":
+                input_iso = cmd[i + 1]
+        assert self.input_iso == input_iso
+        assert ti.checksums.checksums[self.image_relative_path] == self.image_checksum
+
+    def _assert_implantisomd5(self, cmd):
+        assert cmd[0] == "/usr/bin/implantisomd5"
+        assert cmd[-1] == self.temp_iso
+
+
+class DummyImage:
+    def __init__(self, path, content, checksum=None):
+        self.path = path
+        self.content = content
+        self.checksum = checksum or helpers.hash_string("sha256", content)
+
+
+@mock.patch("os.rename")
+@mock.patch("pungi.phases.createiso.run", new_callable=_MockRun)
+class FixChecksumsTest(helpers.PungiTestCase):
+    def test_checksum_matches(self, mock_run, mock_rename):
+        compose = helpers.DummyCompose(self.topdir, {})
+        arch = "x86_64"
+        iso_path = "DUMMY_ISO"
+
+        with mock.patch(
+            "pungi.wrappers.iso.mount",
+            new=mk_mount(self.topdir, [DummyImage("images/eltorito.img", "eltorito")]),
+        ):
+            createiso.fix_treeinfo_checksums(compose, iso_path, arch)
+
+        self.assertEqual(mock_run.num_calls, 0)
+        self.assertEqual(mock_rename.call_args_list, [])
+
+    def test_checksum_fix(self, mock_run, mock_rename):
+        compose = helpers.DummyCompose(self.topdir, {})
+        arch = "x86_64"
+        img = "images/eltorito.img"
+        content = "eltorito"
+        iso_path = "DUMMY_ISO"
+        mock_run.input_iso = iso_path
+        mock_run.image_relative_path = "images/eltorito.img"
+        mock_run.image_checksum = ("sha256", helpers.hash_string("sha256", content))
+
+        with mock.patch(
+            "pungi.wrappers.iso.mount",
+            new=mk_mount(self.topdir, [DummyImage(img, content, "abc")]),
+        ):
+            createiso.fix_treeinfo_checksums(compose, iso_path, arch)
+
+        # The new image was copied over the old one
+        self.assertEqual(
+            mock_rename.call_args_list, [mock.call(mock_run.temp_iso, iso_path)]
+        )
--- a/tests/test_createiso_script.py
+++ b/tests/test_createiso_script.py
@ -1,6 +1,10 @@
 # -*- coding: utf-8 -*-

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+from parameterized import parameterized

 import os
 from six.moves import StringIO
@ -266,58 +270,6 @@ class CreateIsoScriptTest(helpers.PungiTestCase):
            ]
        )

-    def test_bootable_run_buildinstall(self):
-        createiso.write_script(
-            createiso.CreateIsoOpts(
-                output_dir=self.outdir,
-                iso_name="DP-1.0-20160405.t.3-ppc64.iso",
-                volid="DP-1.0-20160405.t.3",
-                graft_points="graft-list",
-                arch="ppc64",
-                buildinstall_method="buildinstall",
-            ),
-            self.out,
-        )
-
-        self.assertScript(
-            [
-                " ".join(
-                    [
-                        "/usr/bin/genisoimage",
-                        "-untranslated-filenames",
-                        "-volid",
-                        "DP-1.0-20160405.t.3",
-                        "-J",
-                        "-joliet-long",
-                        "-rational-rock",
-                        "-translation-table",
-                        "-x",
-                        "./lost+found",
-                        "-part",
-                        "-hfs",
-                        "-r",
-                        "-l",
-                        "-sysid",
-                        "PPC",
-                        "-no-desktop",
-                        "-allow-multidot",
-                        "-chrp-boot",
-                        "-map",
-                        "/usr/lib/anaconda-runtime/boot/mapping",
-                        "-hfs-bless",
-                        "/ppc/mac",
-                        "-o",
-                        "DP-1.0-20160405.t.3-ppc64.iso",
-                        "-graft-points",
-                        "-path-list",
-                        "graft-list",
-                    ]
-                ),
-                " ".join(["/usr/bin/implantisomd5", "DP-1.0-20160405.t.3-ppc64.iso"]),
-                "isoinfo -R -f -i DP-1.0-20160405.t.3-ppc64.iso | grep -v '/TRANS.TBL$' | sort >> DP-1.0-20160405.t.3-ppc64.iso.manifest",  # noqa: E501
-            ]
-        )
-
    @mock.patch("sys.stderr")
    @mock.patch("kobo.shortcuts.run")
    def test_run_with_jigdo_bad_args(self, run, stderr):
@ -391,3 +343,27 @@ class CreateIsoScriptTest(helpers.PungiTestCase):
                ),
            ]
        )
+
+    @parameterized.expand(
+        [("644", 0o644), ("664", 0o664), ("666", 0o666), ("2644", 0o2644)]
+    )
+    def test_get_perms_non_executable(self, test_name, mode):
+        path = helpers.touch(os.path.join(self.topdir, "f"), mode=mode)
+        self.assertEqual(createiso._get_perms(path), 0o444)
+
+    @parameterized.expand(
+        [
+            ("544", 0o544),
+            ("554", 0o554),
+            ("555", 0o555),
+            ("744", 0o744),
+            ("755", 0o755),
+            ("774", 0o774),
+            ("775", 0o775),
+            ("777", 0o777),
+            ("2775", 0o2775),
+        ]
+    )
+    def test_get_perms_executable(self, test_name, mode):
+        path = helpers.touch(os.path.join(self.topdir, "f"), mode=mode)
+        self.assertEqual(createiso._get_perms(path), 0o555)
--- a/tests/test_createrepophase.py
+++ b/tests/test_createrepophase.py
@ -8,7 +8,10 @@ except ImportError:
 import glob
 import os

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six

 from pungi.module_util import Modulemd
--- a/tests/test_extra_files_phase.py
+++ b/tests/test_extra_files_phase.py
@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os

 from productmd.extra_files import ExtraFiles
--- a/tests/test_extra_isos_phase.py
+++ b/tests/test_extra_isos_phase.py
@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-

 import logging
-import mock
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six

 import os
@ -130,6 +134,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                ),
            ],
        )
+        iso_path = os.path.join(self.topdir, "compose/Server/x86_64/iso/my.iso")
        self.assertEqual(
            rcc.call_args_list,
            [
@ -148,6 +153,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                    log_file=os.path.join(
                        self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                    ),
+                    iso_path=iso_path,
                )
            ],
        )
@ -158,7 +164,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                    compose,
                    server,
                    "x86_64",
-                    os.path.join(self.topdir, "compose/Server/x86_64/iso/my.iso"),
+                    iso_path,
                    True,
                    additional_variants=["Client"],
                )
@ -205,6 +211,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                ),
            ],
        )
+        iso_path = os.path.join(self.topdir, "compose/Server/x86_64/iso/my.iso")
        self.assertEqual(
            rcc.call_args_list,
            [
@ -223,6 +230,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                    log_file=os.path.join(
                        self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                    ),
+                    iso_path=iso_path,
                )
            ],
        )
@ -233,7 +241,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                    compose,
                    server,
                    "x86_64",
-                    os.path.join(self.topdir, "compose/Server/x86_64/iso/my.iso"),
+                    iso_path,
                    True,
                    additional_variants=["Client"],
                )
@ -278,6 +286,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                ),
            ],
        )
+        iso_path = os.path.join(self.topdir, "compose/Server/x86_64/iso/my.iso")
        self.assertEqual(
            rcc.call_args_list,
            [
@ -296,6 +305,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                    log_file=os.path.join(
                        self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                    ),
+                    iso_path=iso_path,
                )
            ],
        )
@ -306,7 +316,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                    compose,
                    server,
                    "x86_64",
-                    os.path.join(self.topdir, "compose/Server/x86_64/iso/my.iso"),
+                    iso_path,
                    True,
                    additional_variants=["Client"],
                )
@ -353,6 +363,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                ),
            ],
        )
+        iso_path = os.path.join(self.topdir, "compose/Server/x86_64/iso/my.iso")
        self.assertEqual(
            rcc.call_args_list,
            [
@ -371,6 +382,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                    log_file=os.path.join(
                        self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                    ),
+                    iso_path=iso_path,
                )
            ],
        )
@ -381,7 +393,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                    compose,
                    server,
                    "x86_64",
-                    os.path.join(self.topdir, "compose/Server/x86_64/iso/my.iso"),
+                    iso_path,
                    False,
                    additional_variants=["Client"],
                )
@ -423,6 +435,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                ),
            ],
        )
+        iso_path = os.path.join(self.topdir, "compose/Server/source/iso/my.iso")
        self.assertEqual(
            rcc.call_args_list,
            [
@ -441,6 +454,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                    log_file=os.path.join(
                        self.topdir, "logs/src/extraiso-my.iso.src.log"
                    ),
+                    iso_path=iso_path,
                )
            ],
        )
@ -451,7 +465,7 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                    compose,
                    server,
                    "src",
-                    os.path.join(self.topdir, "compose/Server/source/iso/my.iso"),
+                    iso_path,
                    False,
                    additional_variants=["Client"],
                )
@ -863,10 +877,8 @@ class GetIsoContentsTest(helpers.PungiTestCase):
            "images/efiboot.img": os.path.join(iso_dir, "images/efiboot.img"),
        }

-        ggp.side_effect = (
-            lambda compose, x: gp[x[0][len(self.topdir) + 1 :]]
-            if len(x) == 1
-            else bi_gp
+        ggp.side_effect = lambda compose, x: (
+            gp[x[0][len(self.topdir) + 1 :]] if len(x) == 1 else bi_gp
        )
        gp_file = os.path.join(self.topdir, "work/x86_64/iso/my.iso-graft-points")

@ -1078,7 +1090,9 @@ class ExtraisoTryReusePhaseTest(helpers.PungiTestCase):
        )

    def test_buildinstall_changed(self):
-        compose = helpers.DummyCompose(self.topdir, {"extraiso_allow_reuse": True})
+        compose = helpers.DummyCompose(
+            self.topdir, {"extraiso_allow_reuse": True, "sigkeys": ["abcdef"]}
+        )
        thread = extra_isos.ExtraIsosThread(compose, mock.Mock())
        thread.logger = self.logger
        thread.bi = mock.Mock()
@ -1092,7 +1106,9 @@ class ExtraisoTryReusePhaseTest(helpers.PungiTestCase):
        )

    def test_no_old_config(self):
-        compose = helpers.DummyCompose(self.topdir, {"extraiso_allow_reuse": True})
+        compose = helpers.DummyCompose(
+            self.topdir, {"extraiso_allow_reuse": True, "sigkeys": ["abcdef"]}
+        )
        thread = extra_isos.ExtraIsosThread(compose, mock.Mock())
        thread.logger = self.logger
        opts = CreateIsoOpts()
@ -1104,7 +1120,9 @@ class ExtraisoTryReusePhaseTest(helpers.PungiTestCase):
        )

    def test_old_config_changed(self):
-        compose = helpers.DummyCompose(self.topdir, {"extraiso_allow_reuse": True})
+        compose = helpers.DummyCompose(
+            self.topdir, {"extraiso_allow_reuse": True, "sigkeys": ["abcdef"]}
+        )
        old_config = compose.conf.copy()
        old_config["release_version"] = "2"
        compose.load_old_compose_config.return_value = old_config
@ -1119,7 +1137,9 @@ class ExtraisoTryReusePhaseTest(helpers.PungiTestCase):
        )

    def test_no_old_metadata(self):
-        compose = helpers.DummyCompose(self.topdir, {"extraiso_allow_reuse": True})
+        compose = helpers.DummyCompose(
+            self.topdir, {"extraiso_allow_reuse": True, "sigkeys": ["abcdef"]}
+        )
        compose.load_old_compose_config.return_value = compose.conf.copy()
        thread = extra_isos.ExtraIsosThread(compose, mock.Mock())
        thread.logger = self.logger
@ -1133,7 +1153,9 @@ class ExtraisoTryReusePhaseTest(helpers.PungiTestCase):

    @mock.patch("pungi.phases.extra_isos.read_json_file")
    def test_volume_id_differs(self, read_json_file):
-        compose = helpers.DummyCompose(self.topdir, {"extraiso_allow_reuse": True})
+        compose = helpers.DummyCompose(
+            self.topdir, {"extraiso_allow_reuse": True, "sigkeys": ["abcdef"]}
+        )
        compose.load_old_compose_config.return_value = compose.conf.copy()
        thread = extra_isos.ExtraIsosThread(compose, mock.Mock())
        thread.logger = self.logger
@ -1150,7 +1172,9 @@ class ExtraisoTryReusePhaseTest(helpers.PungiTestCase):

    @mock.patch("pungi.phases.extra_isos.read_json_file")
    def test_packages_differ(self, read_json_file):
-        compose = helpers.DummyCompose(self.topdir, {"extraiso_allow_reuse": True})
+        compose = helpers.DummyCompose(
+            self.topdir, {"extraiso_allow_reuse": True, "sigkeys": ["abcdef"]}
+        )
        compose.load_old_compose_config.return_value = compose.conf.copy()
        thread = extra_isos.ExtraIsosThread(compose, mock.Mock())
        thread.logger = self.logger
@ -1172,7 +1196,7 @@ class ExtraisoTryReusePhaseTest(helpers.PungiTestCase):
        )

    @mock.patch("pungi.phases.extra_isos.read_json_file")
-    def test_runs_perform_reuse(self, read_json_file):
+    def test_unsigned_packages(self, read_json_file):
        compose = helpers.DummyCompose(self.topdir, {"extraiso_allow_reuse": True})
        compose.load_old_compose_config.return_value = compose.conf.copy()
        thread = extra_isos.ExtraIsosThread(compose, mock.Mock())
@ -1195,6 +1219,38 @@ class ExtraisoTryReusePhaseTest(helpers.PungiTestCase):
            },
        }

+        self.assertFalse(
+            thread.try_reuse(
+                compose, compose.variants["Server"], "x86_64", "abcdef", opts
+            )
+        )
+
+    @mock.patch("pungi.phases.extra_isos.read_json_file")
+    def test_runs_perform_reuse(self, read_json_file):
+        compose = helpers.DummyCompose(
+            self.topdir, {"extraiso_allow_reuse": True, "sigkeys": ["abcdef"]}
+        )
+        compose.load_old_compose_config.return_value = compose.conf.copy()
+        thread = extra_isos.ExtraIsosThread(compose, mock.Mock())
+        thread.logger = self.logger
+        thread.perform_reuse = mock.Mock()
+
+        new_graft_points = os.path.join(self.topdir, "new_graft_points")
+        helpers.touch(new_graft_points)
+        opts = CreateIsoOpts(graft_points=new_graft_points, volid="volid")
+
+        old_graft_points = os.path.join(self.topdir, "old_graft_points")
+        helpers.touch(old_graft_points)
+        dummy_iso_path = "dummy-iso-path/dummy.iso"
+        read_json_file.return_value = {
+            "opts": {
+                "graft_points": old_graft_points,
+                "volid": "volid",
+                "output_dir": os.path.dirname(dummy_iso_path),
+                "iso_name": os.path.basename(dummy_iso_path),
+            },
+        }
+
        self.assertTrue(
            thread.try_reuse(
                compose, compose.variants["Server"], "x86_64", "abcdef", opts
--- a/tests/test_gather.py
+++ b/tests/test_gather.py
@ -2286,6 +2286,7 @@ class DNFDepsolvingTestCase(DepsolvingBase, unittest.TestCase):
        conf = Conf(base_arch)
        conf.persistdir = persistdir
        conf.cachedir = self.cachedir
+        conf.optional_metadata_types = ["filelists"]
        if exclude:
            conf.exclude = exclude
        dnf = DnfWrapper(conf)
--- a/tests/test_gather_method_deps.py
+++ b/tests/test_gather_method_deps.py
@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 from pungi.phases.gather.methods import method_deps as deps
 from tests import helpers
--- a/tests/test_gather_method_hybrid.py
+++ b/tests/test_gather_method_hybrid.py
@ -2,7 +2,11 @@

 from collections import namedtuple
 import copy
-import mock
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os

 import six
--- a/tests/test_gather_method_nodeps.py
+++ b/tests/test_gather_method_nodeps.py
@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os

 import six
--- a/tests/test_gather_phase.py
+++ b/tests/test_gather_phase.py
@ -4,7 +4,10 @@ import copy
 import json
 import os

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 try:
    import unittest2 as unittest
@ -1057,10 +1060,8 @@ class TestGatherPackages(helpers.PungiTestCase):
    @mock.patch("pungi.phases.gather.get_gather_method")
    def test_hybrid_method(self, get_gather_method, get_variant_packages):
        packages, groups, filters = mock.Mock(), mock.Mock(), mock.Mock()
-        get_variant_packages.side_effect = (
-            lambda c, v, a, s, p: (packages, groups, filters)
-            if s == "comps"
-            else (None, None, None)
+        get_variant_packages.side_effect = lambda c, v, a, s, p: (
+            (packages, groups, filters) if s == "comps" else (None, None, None)
        )
        get_gather_method.return_value.return_value.return_value = {
            "rpm": [],
--- a/tests/test_gather_source_module.py
+++ b/tests/test_gather_source_module.py
@ -5,7 +5,10 @@ try:
 except ImportError:
    import unittest

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six

 from pungi.phases.gather.sources.source_module import GatherSourceModule
--- a/tests/test_image_container_phase.py
+++ b/tests/test_image_container_phase.py
@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 import os

@ -122,6 +125,7 @@ class ImageContainerThreadTest(helpers.PungiTestCase):
            self.topdir,
            {
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "translate_paths": [(self.topdir, "http://root")],
            },
        )
@ -226,7 +230,7 @@ class ImageContainerThreadTest(helpers.PungiTestCase):
                (self.compose, self.compose.variants["Server"], self.cfg.copy()), 1
            )

-        self.assertRegex(str(ctx.exception), r"task 12345 failed: see .+ for details")
+        self.assertRegex(str(ctx.exception), r"task failed: 12345. See .+ for details")
        self.assertRepoFile()
        self.assertKojiCalls(self.cfg)
        self.assertEqual(add_metadata.call_args_list, [])
--- a/tests/test_imagebuildphase.py
+++ b/tests/test_imagebuildphase.py
@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 import six

@ -35,6 +38,7 @@ class TestImageBuildPhase(PungiTestCase):
            {
                "image_build": {"^Client|Server$": [original_image_conf]},
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -45,7 +49,7 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()
        client_args = {
            "original_image_conf": original_image_conf,
            "image_conf": {
@ -127,6 +131,7 @@ class TestImageBuildPhase(PungiTestCase):
                "image_build_version": "Rawhide",
                "image_build": {"^Server$": [original_image_conf]},
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -137,7 +142,7 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()
        server_args = {
            "original_image_conf": original_image_conf,
            "image_conf": {
@ -188,6 +193,7 @@ class TestImageBuildPhase(PungiTestCase):
                "image_build_target": "f24",
                "image_build": {"^Server$": [original_image_conf]},
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -196,7 +202,7 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()
        server_args = {
            "original_image_conf": original_image_conf,
            "image_conf": {
@ -251,6 +257,7 @@ class TestImageBuildPhase(PungiTestCase):
                    ]
                },
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -261,8 +268,8 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertFalse(phase.pool.add.called)
-        self.assertFalse(phase.pool.queue_put.called)
+        phase.pool.add.assert_not_called()
+        phase.pool.queue_put.assert_not_called()

    @mock.patch("pungi.phases.image_build.ThreadPool")
    def test_image_build_set_install_tree(self, ThreadPool):
@ -286,6 +293,7 @@ class TestImageBuildPhase(PungiTestCase):
            {
                "image_build": {"^Server$": [original_image_conf]},
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )
        compose.setup_optional()
@ -297,9 +305,9 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()

-        self.assertTrue(phase.pool.queue_put.called_once)
+        phase.pool.queue_put.assert_called_once()
        args, kwargs = phase.pool.queue_put.call_args
        self.assertEqual(args[0][0], compose)
        self.assertDictEqual(
@ -353,6 +361,7 @@ class TestImageBuildPhase(PungiTestCase):
            {
                "image_build": {"^Server$": [original_image_conf]},
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "translate_paths": [("/my", "http://example.com")],
            },
        )
@ -364,9 +373,9 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()

-        self.assertTrue(phase.pool.queue_put.called_once)
+        phase.pool.queue_put.assert_called_once()
        args, kwargs = phase.pool.queue_put.call_args
        self.assertEqual(args[0][0], compose)
        self.assertDictEqual(
@ -419,6 +428,7 @@ class TestImageBuildPhase(PungiTestCase):
            {
                "image_build": {"^Server$": [original_image_conf]},
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )
        compose.setup_optional()
@ -430,9 +440,9 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()

-        self.assertTrue(phase.pool.queue_put.called_once)
+        phase.pool.queue_put.assert_called_once()
        args, kwargs = phase.pool.queue_put.call_args
        self.assertEqual(args[0][0], compose)
        self.assertDictEqual(
@ -491,6 +501,7 @@ class TestImageBuildPhase(PungiTestCase):
            {
                "image_build": {"^Server$": [original_image_conf]},
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -501,9 +512,9 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()

-        self.assertTrue(phase.pool.queue_put.called_once)
+        phase.pool.queue_put.assert_called_once()
        args, kwargs = phase.pool.queue_put.call_args
        self.assertEqual(args[0][0], compose)
        self.assertDictEqual(
@ -559,6 +570,7 @@ class TestImageBuildPhase(PungiTestCase):
                    ]
                },
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -569,9 +581,9 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()

-        self.assertTrue(phase.pool.queue_put.called_once)
+        phase.pool.queue_put.assert_called_once()
        args, kwargs = phase.pool.queue_put.call_args
        self.assertEqual(
            args[0][1].get("image_conf", {}).get("image-build", {}).get("release"),
@ -602,6 +614,7 @@ class TestImageBuildPhase(PungiTestCase):
                    ]
                },
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -612,9 +625,9 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()

-        self.assertTrue(phase.pool.queue_put.called_once)
+        phase.pool.queue_put.assert_called_once()
        args, kwargs = phase.pool.queue_put.call_args
        self.assertEqual(
            args[0][1].get("image_conf", {}).get("image-build", {}).get("release"),
@ -645,6 +658,7 @@ class TestImageBuildPhase(PungiTestCase):
                    ]
                },
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -655,9 +669,9 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()

-        self.assertTrue(phase.pool.queue_put.called_once)
+        phase.pool.queue_put.assert_called_once()
        args, kwargs = phase.pool.queue_put.call_args
        self.assertTrue(args[0][1].get("scratch"))

@ -681,6 +695,7 @@ class TestImageBuildPhase(PungiTestCase):
            {
                "image_build": {"^Server-optional$": [original_image_conf]},
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )
        compose.setup_optional()
@ -692,7 +707,7 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()
        server_args = {
            "original_image_conf": original_image_conf,
            "image_conf": {
@ -744,6 +759,7 @@ class TestImageBuildPhase(PungiTestCase):
            {
                "image_build": {"^Server$": [original_image_conf]},
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )
        compose.setup_optional()
@ -755,7 +771,7 @@ class TestImageBuildPhase(PungiTestCase):
        phase.run()

        # assert at least one thread was started
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()
        server_args = {
            "original_image_conf": original_image_conf,
            "image_conf": {
@ -943,7 +959,9 @@ class TestCreateImageBuildThread(PungiTestCase):
    @mock.patch("pungi.phases.image_build.KojiWrapper")
    @mock.patch("pungi.phases.image_build.Linker")
    def test_process_handle_fail(self, Linker, KojiWrapper):
-        compose = DummyCompose(self.topdir, {"koji_profile": "koji"})
+        compose = DummyCompose(
+            self.topdir, {"koji_profile": "koji", "koji_cache": "/tmp"}
+        )
        pool = mock.Mock()
        cmd = {
            "image_conf": {
@ -1000,7 +1018,9 @@ class TestCreateImageBuildThread(PungiTestCase):
    @mock.patch("pungi.phases.image_build.KojiWrapper")
    @mock.patch("pungi.phases.image_build.Linker")
    def test_process_handle_exception(self, Linker, KojiWrapper):
-        compose = DummyCompose(self.topdir, {"koji_profile": "koji"})
+        compose = DummyCompose(
+            self.topdir, {"koji_profile": "koji", "koji_cache": "/tmp"}
+        )
        pool = mock.Mock()
        cmd = {
            "image_conf": {
@ -1046,7 +1066,9 @@ class TestCreateImageBuildThread(PungiTestCase):
    @mock.patch("pungi.phases.image_build.KojiWrapper")
    @mock.patch("pungi.phases.image_build.Linker")
    def test_process_handle_fail_only_one_optional(self, Linker, KojiWrapper):
-        compose = DummyCompose(self.topdir, {"koji_profile": "koji"})
+        compose = DummyCompose(
+            self.topdir, {"koji_profile": "koji", "koji_cache": "/tmp"}
+        )
        pool = mock.Mock()
        cmd = {
            "image_conf": {
--- a/tests/test_imagechecksumphase.py
+++ b/tests/test_imagechecksumphase.py
@ -4,7 +4,10 @@ try:
    import unittest2 as unittest
 except ImportError:
    import unittest
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 import os
 import tempfile
--- a/tests/test_initphase.py
+++ b/tests/test_initphase.py
@ -5,7 +5,10 @@ try:
    import unittest2 as unittest
 except ImportError:
    import unittest
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 import six

--- a/tests/test_iso_wrapper.py
+++ b/tests/test_iso_wrapper.py
@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-

 import itertools
-import mock
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os
 import six

@ -20,6 +24,19 @@ Supported ISO: no

 INCORRECT_OUTPUT = """This should never happen: File not found"""

+XORRISO_LOAD_OUTPUT = """\
+xorriso 1.5.4 : RockRidge filesystem manipulator, libburnia project.
+
+xorriso : NOTE : Loading ISO image tree from LBA 0
+xorriso : UPDATE :    7074 nodes read in 1 seconds
+Drive current: -indev 'dummy.iso'
+Media current: stdio file, overwriteable
+Media status : is written , is appendable
+Boot record  : El Torito , MBR isohybrid cyl-align-off GPT
+Media summary: 1 session, 5415454 data blocks, 10.3g data, 4086g free
+Volume id    : 'My volume id'
+"""
+
 # Cached to use in tests that mock os.listdir
 orig_listdir = os.listdir

@ -28,6 +45,7 @@ def fake_listdir(pattern, result=None, exc=None):
    """Create a function that mocks os.listdir. If the path contains pattern,
    result will be returned or exc raised. Otherwise it's normal os.listdir
    """
+
    # The point of this is to avoid issues on Python 2, where apparently
    # isdir() is using listdir(), so the mocking is breaking it.
    def worker(path):
@ -182,6 +200,11 @@ class TestIsoUtils(unittest.TestCase):
        self.assertEqual(len(mock_unmount.call_args_list), 0)
        self.assertEqual(len(log.mock_calls), 1)

+    @mock.patch("pungi.wrappers.iso.run")
+    def test_get_volume_id_xorriso(self, mock_run):
+        mock_run.return_value = (0, XORRISO_LOAD_OUTPUT)
+        self.assertEqual(iso.get_volume_id("/dummy.iso", True), "My volume id")
+

 class TestCmpGraftPoints(unittest.TestCase):
    def assertSorted(self, *args):
--- a/tests/test_kiwibuildphase.py
+++ b/tests/test_kiwibuildphase.py
@ -0,0 +1,459 @@
+import os
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+from pungi.phases.kiwibuild import KiwiBuildPhase, RunKiwiBuildThread
+from tests.helpers import DummyCompose, PungiTestCase
+
+
+MINIMAL_CONF = {
+    "description_scm": "https://example.com/kiwi.git",
+    "description_path": "Fedora.kiwi",
+    "kiwi_profile": "Cloud-Base-Generic",
+}
+
+
+def _merge(a, b):
+    """This would be a | b on 3.9 and later, or {**a, **b} or 3.5 and later."""
+    c = a.copy()
+    c.update(b)
+    return c
+
+
+@mock.patch("pungi.phases.kiwibuild.ThreadPool")
+class TestKiwiBuildPhase(PungiTestCase):
+    def test_minimal(self, ThreadPool):
+        cfg = _merge({"target": "f40"}, MINIMAL_CONF)
+        compose = DummyCompose(self.topdir, {"kiwibuild": {"^Server$": [cfg]}})
+
+        self.assertValidConfig(compose.conf)
+
+        phase = KiwiBuildPhase(compose)
+
+        phase.run()
+        phase.pool.add.assert_called()
+        assert phase.pool.queue_put.call_args_list == [
+            mock.call(
+                (
+                    compose,
+                    compose.variants["Server"],
+                    cfg,
+                    ["amd64", "x86_64"],
+                    {
+                        "release": None,
+                        "target": "f40",
+                        "descscm": MINIMAL_CONF["description_scm"],
+                        "descpath": MINIMAL_CONF["description_path"],
+                        "type": None,
+                        "type_attr": None,
+                        "bundle_name_format": None,
+                    },
+                    [self.topdir + "/compose/Server/$arch/os"],
+                    [],  # failable arches
+                )
+            )
+        ]
+
+    def test_full(self, ThreadPool):
+        cfg = _merge(
+            {
+                "target": "f40",
+                "release": "1234",
+                "arches": ["x86_64"],
+                "repos": ["https://example.com/repo/", "Client"],
+                "failable": ["*"],
+                "subvariant": "Test",
+                "type": "custom",
+                "type_attr": ["foo", "bar"],
+                "bundle_name_format": "fmt",
+            },
+            MINIMAL_CONF,
+        )
+        compose = DummyCompose(self.topdir, {"kiwibuild": {"^Server$": [cfg]}})
+
+        self.assertValidConfig(compose.conf)
+
+        phase = KiwiBuildPhase(compose)
+
+        phase.run()
+        phase.pool.add.assert_called()
+        assert phase.pool.queue_put.call_args_list == [
+            mock.call(
+                (
+                    compose,
+                    compose.variants["Server"],
+                    cfg,
+                    ["x86_64"],
+                    {
+                        "release": "1234",
+                        "target": "f40",
+                        "descscm": MINIMAL_CONF["description_scm"],
+                        "descpath": MINIMAL_CONF["description_path"],
+                        "type": "custom",
+                        "type_attr": ["foo", "bar"],
+                        "bundle_name_format": "fmt",
+                    },
+                    [
+                        "https://example.com/repo/",
+                        self.topdir + "/compose/Client/$arch/os",
+                        self.topdir + "/compose/Server/$arch/os",
+                    ],
+                    ["x86_64"],
+                )
+            )
+        ]
+
+    def test_failable(self, ThreadPool):
+        cfg = _merge({"target": "f40", "failable": ["x86_64"]}, MINIMAL_CONF)
+        compose = DummyCompose(self.topdir, {"kiwibuild": {"^Server$": [cfg]}})
+
+        self.assertValidConfig(compose.conf)
+
+        phase = KiwiBuildPhase(compose)
+
+        phase.run()
+        phase.pool.add.assert_called()
+        assert phase.pool.queue_put.call_args_list == [
+            mock.call(
+                (
+                    compose,
+                    compose.variants["Server"],
+                    cfg,
+                    ["amd64", "x86_64"],
+                    {
+                        "release": None,
+                        "target": "f40",
+                        "descscm": MINIMAL_CONF["description_scm"],
+                        "descpath": MINIMAL_CONF["description_path"],
+                        "type": None,
+                        "type_attr": None,
+                        "bundle_name_format": None,
+                    },
+                    [self.topdir + "/compose/Server/$arch/os"],
+                    ["x86_64"],  # failable arches
+                )
+            )
+        ]
+
+    def test_with_phase_opts(self, ThreadPool):
+        cfg = {"kiwi_profile": "Generic"}
+        compose = DummyCompose(
+            self.topdir,
+            {
+                "kiwibuild": {"^Server$": [cfg]},
+                "kiwibuild_target": "f40",
+                "kiwibuild_release": "1234",
+                "kiwibuild_description_scm": "foo",
+                "kiwibuild_description_path": "bar",
+                "kiwibuild_type": "custom",
+                "kiwibuild_type_attr": ["foo", "bar"],
+                "kiwibuild_bundle_name_format": "fmt",
+            },
+        )
+
+        self.assertValidConfig(compose.conf)
+
+        phase = KiwiBuildPhase(compose)
+
+        phase.run()
+        phase.pool.add.assert_called()
+        assert phase.pool.queue_put.call_args_list == [
+            mock.call(
+                (
+                    compose,
+                    compose.variants["Server"],
+                    cfg,
+                    ["amd64", "x86_64"],
+                    {
+                        "release": "1234",
+                        "target": "f40",
+                        "descscm": "foo",
+                        "descpath": "bar",
+                        "type": "custom",
+                        "type_attr": ["foo", "bar"],
+                        "bundle_name_format": "fmt",
+                    },
+                    [self.topdir + "/compose/Server/$arch/os"],
+                    [],  # failable arches
+                )
+            )
+        ]
+
+    def test_with_global_opts(self, ThreadPool):
+        cfg = MINIMAL_CONF
+        compose = DummyCompose(
+            self.topdir,
+            {
+                "kiwibuild": {"^Server$": [cfg]},
+                "global_target": "f40",
+                "global_release": "1234",
+            },
+        )
+
+        self.assertValidConfig(compose.conf)
+
+        phase = KiwiBuildPhase(compose)
+
+        phase.run()
+        phase.pool.add.assert_called()
+        assert phase.pool.queue_put.call_args_list == [
+            mock.call(
+                (
+                    compose,
+                    compose.variants["Server"],
+                    cfg,
+                    ["amd64", "x86_64"],
+                    {
+                        "release": "1234",
+                        "target": "f40",
+                        "descscm": MINIMAL_CONF["description_scm"],
+                        "descpath": MINIMAL_CONF["description_path"],
+                        "type": None,
+                        "type_attr": None,
+                        "bundle_name_format": None,
+                    },
+                    [self.topdir + "/compose/Server/$arch/os"],
+                    [],  # failable arches
+                )
+            )
+        ]
+
+
+@mock.patch("pungi.phases.kiwibuild.Linker")
+@mock.patch("pungi.util.get_mtime")
+@mock.patch("pungi.util.get_file_size")
+@mock.patch("pungi.wrappers.kojiwrapper.KojiWrapper")
+class TestKiwiBuildThread(PungiTestCase):
+    def _img_path(self, arch, filename=None):
+        path = self.topdir + "/compose/Server/%s/images" % arch
+        if filename:
+            path += "/" + filename
+        return path
+
+    def test_process(self, KojiWrapper, get_file_size, get_mtime, Linker):
+        img_name = "FCBG.{arch}-Rawhide-1.6.vagrant.libvirt.box"
+        self.repo = self.topdir + "/compose/Server/$arch/os"
+        compose = DummyCompose(
+            self.topdir,
+            {
+                "koji_profile": "koji",
+                "kiwibuild_bundle_format": "%N-%P-40_Beta-%I.%A.%T",
+            },
+        )
+        config = _merge({"subvariant": "Test"}, MINIMAL_CONF)
+        pool = mock.Mock()
+
+        get_image_paths = KojiWrapper.return_value.get_image_paths
+        get_image_paths.return_value = {
+            "x86_64": [
+                "/koji/task/1234/FCBG.x86_64-Rawhide-1.6.packages",
+                "/koji/task/1234/%s" % img_name.format(arch="x86_64"),
+            ],
+            "amd64": [
+                "/koji/task/1234/FCBG.amd64-Rawhide-1.6.packages",
+                "/koji/task/1234/%s" % img_name.format(arch="amd64"),
+            ],
+        }
+
+        KojiWrapper.return_value.koji_proxy.kiwiBuild.return_value = 1234
+        KojiWrapper.return_value.watch_task.return_value = 0
+
+        t = RunKiwiBuildThread(pool)
+        get_file_size.return_value = 1024
+        get_mtime.return_value = 13579
+        t.process(
+            (
+                compose,
+                compose.variants["Server"],
+                config,
+                ["amd64", "x86_64"],
+                {
+                    "release": "1.6",
+                    "target": "f40",
+                    "descscm": MINIMAL_CONF["description_scm"],
+                    "descpath": MINIMAL_CONF["description_path"],
+                    "type": "t",
+                    "type_attr": ["ta"],
+                    "bundle_name_format": "fmt",
+                },
+                [self.repo],
+                [],
+            ),
+            1,
+        )
+
+        assert KojiWrapper.return_value.koji_proxy.kiwiBuild.mock_calls == [
+            mock.call(
+                "f40",
+                ["amd64", "x86_64"],
+                MINIMAL_CONF["description_scm"],
+                MINIMAL_CONF["description_path"],
+                profile=MINIMAL_CONF["kiwi_profile"],
+                release="1.6",
+                repos=[self.repo],
+                type="t",
+                type_attr=["ta"],
+                result_bundle_name_format="fmt",
+                optional_arches=[],
+            )
+        ]
+
+        assert get_image_paths.mock_calls == [mock.call(1234)]
+        assert os.path.isdir(self._img_path("x86_64"))
+        assert os.path.isdir(self._img_path("amd64"))
+        Linker.return_value.link.assert_has_calls(
+            [
+                mock.call(
+                    "/koji/task/1234/FCBG.amd64-Rawhide-1.6.vagrant.libvirt.box",
+                    self._img_path("amd64", img_name.format(arch="amd64")),
+                    link_type="hardlink-or-copy",
+                ),
+                mock.call(
+                    "/koji/task/1234/FCBG.x86_64-Rawhide-1.6.vagrant.libvirt.box",
+                    self._img_path("x86_64", img_name.format(arch="x86_64")),
+                    link_type="hardlink-or-copy",
+                ),
+            ],
+            any_order=True,
+        )
+
+        assert len(compose.im.add.call_args_list) == 2
+        for call in compose.im.add.call_args_list:
+            _, kwargs = call
+            image = kwargs["image"]
+            expected_path = "Server/{0.arch}/images/{1}".format(
+                image, img_name.format(arch=image.arch)
+            )
+            assert kwargs["variant"] == "Server"
+            assert kwargs["arch"] in ("amd64", "x86_64")
+            assert kwargs["arch"] == image.arch
+            assert image.path == expected_path
+            assert "vagrant-libvirt.box" == image.format
+            assert "vagrant-libvirt" == image.type
+            assert "Test" == image.subvariant
+
+    def test_handle_koji_fail(self, KojiWrapper, get_file_size, get_mtime, Linker):
+        self.repo = self.topdir + "/compose/Server/$arch/os"
+        compose = DummyCompose(self.topdir, {"koji_profile": "koji"})
+        config = MINIMAL_CONF
+        pool = mock.Mock()
+
+        get_image_paths = KojiWrapper.return_value.get_image_paths
+
+        KojiWrapper.return_value.koji_proxy.kiwiBuild.return_value = 1234
+        KojiWrapper.return_value.watch_task.return_value = 1
+
+        t = RunKiwiBuildThread(pool)
+        try:
+            t.process(
+                (
+                    compose,
+                    compose.variants["Server"],
+                    config,
+                    ["amd64", "x86_64"],
+                    {
+                        "release": "1.6",
+                        "target": "f40",
+                        "descscm": MINIMAL_CONF["description_scm"],
+                        "descpath": MINIMAL_CONF["description_path"],
+                        "type": None,
+                        "type_attr": None,
+                        "bundle_name_format": None,
+                    },
+                    [self.repo],
+                    [],
+                ),
+                1,
+            )
+            assert False, "Exception should have been raised"
+        except RuntimeError:
+            pass
+
+        assert len(KojiWrapper.return_value.koji_proxy.kiwiBuild.mock_calls) == 1
+        assert get_image_paths.mock_calls == []
+        assert Linker.return_value.link.mock_calls == []
+        assert len(compose.im.add.call_args_list) == 0
+
+    def test_handle_fail_on_optional_arch(
+        self, KojiWrapper, get_file_size, get_mtime, Linker
+    ):
+        self.repo = self.topdir + "/compose/Server/$arch/os"
+        compose = DummyCompose(self.topdir, {"koji_profile": "koji"})
+        config = MINIMAL_CONF
+        pool = mock.Mock()
+
+        get_image_paths = KojiWrapper.return_value.get_image_paths
+        get_image_paths.return_value = {
+            "x86_64": [
+                "/koji/task/1234/FCBG.x86_64-Rawhide-1.6.packages",
+                "/koji/task/1234/FCBG.x86_64-Rawhide-1.6.qcow2",
+            ],
+        }
+
+        KojiWrapper.return_value.koji_proxy.kiwiBuild.return_value = 1234
+        KojiWrapper.return_value.watch_task.return_value = 0
+
+        t = RunKiwiBuildThread(pool)
+        get_file_size.return_value = 1024
+        get_mtime.return_value = 13579
+        t.process(
+            (
+                compose,
+                compose.variants["Server"],
+                config,
+                ["amd64", "x86_64"],
+                {
+                    "release": "1.6",
+                    "target": "f40",
+                    "descscm": MINIMAL_CONF["description_scm"],
+                    "descpath": MINIMAL_CONF["description_path"],
+                    "type": None,
+                    "type_attr": None,
+                    "bundle_name_format": None,
+                },
+                [self.repo],
+                ["amd64"],
+            ),
+            1,
+        )
+
+        assert KojiWrapper.return_value.koji_proxy.kiwiBuild.mock_calls == [
+            mock.call(
+                "f40",
+                ["amd64", "x86_64"],
+                MINIMAL_CONF["description_scm"],
+                MINIMAL_CONF["description_path"],
+                profile=MINIMAL_CONF["kiwi_profile"],
+                release="1.6",
+                repos=[self.repo],
+                type=None,
+                type_attr=None,
+                result_bundle_name_format=None,
+                optional_arches=["amd64"],
+            )
+        ]
+        assert get_image_paths.mock_calls == [mock.call(1234)]
+        assert os.path.isdir(self._img_path("x86_64"))
+        assert not os.path.isdir(self._img_path("amd64"))
+        assert Linker.return_value.link.mock_calls == [
+            mock.call(
+                "/koji/task/1234/FCBG.x86_64-Rawhide-1.6.qcow2",
+                self._img_path("x86_64", "FCBG.x86_64-Rawhide-1.6.qcow2"),
+                link_type="hardlink-or-copy",
+            ),
+        ]
+
+        assert len(compose.im.add.call_args_list) == 1
+        _, kwargs = compose.im.add.call_args_list[0]
+        image = kwargs["image"]
+        expected_path = "Server/x86_64/images/FCBG.x86_64-Rawhide-1.6.qcow2"
+        assert kwargs["variant"] == "Server"
+        assert kwargs["arch"] == "x86_64"
+        assert kwargs["arch"] == image.arch
+        assert image.path == expected_path
+        assert "qcow2" == image.format
+        assert "qcow2" == image.type
+        assert "Server" == image.subvariant
--- a/tests/test_koji_wrapper.py
+++ b/tests/test_koji_wrapper.py
@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-

 import json
-import mock
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 try:
    import unittest2 as unittest
@ -121,7 +125,6 @@ class KojiWrapperTest(KojiWrapperBaseTestCase):
        )

    def test_get_image_paths(self):
-
        # The data for this tests is obtained from the actual Koji build. It
        # includes lots of fields that are not used, but for the sake of
        # completeness is fully preserved.
@ -321,7 +324,6 @@ class KojiWrapperTest(KojiWrapperBaseTestCase):
        )

    def test_get_image_paths_failed_subtask(self):
-
        failed = set()

        def failed_callback(arch):
@ -439,96 +441,6 @@ class LiveMediaTestCase(KojiWrapperBaseTestCase):
        )


-class LiveImageKojiWrapperTest(KojiWrapperBaseTestCase):
-    def test_get_create_image_cmd_minimal(self):
-        cmd = self.koji.get_create_image_cmd(
-            "my_name", "1.0", "f24-candidate", "x86_64", "/path/to/ks", ["/repo/1"]
-        )
-        self.assertEqual(cmd[0:3], ["koji", "--profile=custom-koji", "spin-livecd"])
-        six.assertCountEqual(
-            self, cmd[3:7], ["--noprogress", "--scratch", "--wait", "--repo=/repo/1"]
-        )
-        self.assertEqual(
-            cmd[7:], ["my_name", "1.0", "f24-candidate", "x86_64", "/path/to/ks"]
-        )
-
-    def test_get_create_image_cmd_full(self):
-        cmd = self.koji.get_create_image_cmd(
-            "my_name",
-            "1.0",
-            "f24-candidate",
-            "x86_64",
-            "/path/to/ks",
-            ["/repo/1", "/repo/2"],
-            release="1",
-            wait=False,
-            archive=True,
-            specfile="foo.spec",
-            ksurl="https://git.example.com/",
-        )
-        self.assertEqual(cmd[0:3], ["koji", "--profile=custom-koji", "spin-livecd"])
-        self.assertEqual(
-            cmd[-5:], ["my_name", "1.0", "f24-candidate", "x86_64", "/path/to/ks"]
-        )
-        six.assertCountEqual(
-            self,
-            cmd[3:-5],
-            [
-                "--noprogress",
-                "--nowait",
-                "--repo=/repo/1",
-                "--repo=/repo/2",
-                "--release=1",
-                "--specfile=foo.spec",
-                "--ksurl=https://git.example.com/",
-            ],
-        )
-
-    def test_spin_livecd_with_format(self):
-        with self.assertRaises(ValueError):
-            self.koji.get_create_image_cmd(
-                "my_name",
-                "1.0",
-                "f24-candidate",
-                "x86_64",
-                "/path/to/ks",
-                [],
-                image_format="qcow",
-            )
-
-    def test_spin_appliance_with_format(self):
-        cmd = self.koji.get_create_image_cmd(
-            "my_name",
-            "1.0",
-            "f24-candidate",
-            "x86_64",
-            "/path/to/ks",
-            [],
-            image_type="appliance",
-            image_format="qcow",
-        )
-        self.assertEqual(cmd[0:3], ["koji", "--profile=custom-koji", "spin-appliance"])
-        six.assertCountEqual(
-            self, cmd[3:7], ["--noprogress", "--scratch", "--wait", "--format=qcow"]
-        )
-        self.assertEqual(
-            cmd[7:], ["my_name", "1.0", "f24-candidate", "x86_64", "/path/to/ks"]
-        )
-
-    def test_spin_appliance_with_wrong_format(self):
-        with self.assertRaises(ValueError):
-            self.koji.get_create_image_cmd(
-                "my_name",
-                "1.0",
-                "f24-candidate",
-                "x86_64",
-                "/path/to/ks",
-                [],
-                image_type="appliance",
-                image_format="pretty",
-            )
-
-
@mock.patch.dict("os.environ", {"FOO": "BAR"}, clear=True)
 class RunrootKojiWrapperTest(KojiWrapperBaseTestCase):
    def test_get_cmd_minimal(self):
--- a/tests/test_linker.py
+++ b/tests/test_linker.py
@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-


-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import errno
 import os
 import stat
--- a/tests/test_liveimagesphase.py
+++ b/tests/test_liveimagesphase.py
--- a/tests/test_livemediaphase.py
+++ b/tests/test_livemediaphase.py
@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 import os

@ -28,6 +31,7 @@ class TestLiveMediaPhase(PungiTestCase):
                    ]
                },
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -36,7 +40,7 @@ class TestLiveMediaPhase(PungiTestCase):
        phase = LiveMediaPhase(compose)

        phase.run()
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()
        self.assertEqual(
            phase.pool.queue_put.call_args_list,
            [
@ -85,6 +89,7 @@ class TestLiveMediaPhase(PungiTestCase):
                    ]
                },
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -93,7 +98,7 @@ class TestLiveMediaPhase(PungiTestCase):
        phase = LiveMediaPhase(compose)

        phase.run()
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()
        self.assertEqual(
            phase.pool.queue_put.call_args_list,
            [
@ -148,6 +153,7 @@ class TestLiveMediaPhase(PungiTestCase):
                    ]
                },
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -156,7 +162,7 @@ class TestLiveMediaPhase(PungiTestCase):
        phase = LiveMediaPhase(compose)

        phase.run()
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()
        self.assertEqual(
            phase.pool.queue_put.call_args_list,
            [
@ -259,6 +265,7 @@ class TestLiveMediaPhase(PungiTestCase):
                    ]
                },
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -267,7 +274,7 @@ class TestLiveMediaPhase(PungiTestCase):
        phase = LiveMediaPhase(compose)

        phase.run()
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()
        self.assertEqual(
            phase.pool.queue_put.call_args_list,
            [
@ -364,6 +371,7 @@ class TestLiveMediaPhase(PungiTestCase):
                    ]
                },
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -394,6 +402,7 @@ class TestLiveMediaPhase(PungiTestCase):
                    ]
                },
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
            },
        )

@ -444,7 +453,7 @@ class TestLiveMediaPhase(PungiTestCase):
        phase = LiveMediaPhase(compose)

        phase.run()
-        self.assertTrue(phase.pool.add.called)
+        phase.pool.add.assert_called()

        self.assertEqual(
            phase.pool.queue_put.call_args_list,
@ -611,7 +620,9 @@ class TestLiveMediaThread(PungiTestCase):
    @mock.patch("pungi.phases.livemedia_phase.get_file_size")
    @mock.patch("pungi.phases.livemedia_phase.KojiWrapper")
    def test_handle_koji_fail(self, KojiWrapper, get_file_size, get_mtime):
-        compose = DummyCompose(self.topdir, {"koji_profile": "koji"})
+        compose = DummyCompose(
+            self.topdir, {"koji_profile": "koji", "koji_cache": "/tmp"}
+        )
        config = {
            "arches": ["amd64", "x86_64"],
            "ksfile": "file.ks",
@ -688,6 +699,7 @@ class TestLiveMediaThread(PungiTestCase):
            self.topdir,
            {
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "failable_deliverables": [("^.+$", {"*": ["live-media"]})],
            },
        )
@ -757,6 +769,7 @@ class TestLiveMediaThread(PungiTestCase):
            self.topdir,
            {
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "failable_deliverables": [("^.+$", {"*": ["live-media"]})],
            },
        )
--- a/tests/test_media_split.py
+++ b/tests/test_media_split.py
@ -4,7 +4,10 @@ try:
    import unittest2 as unittest
 except ImportError:
    import unittest
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 from pungi import media_split

--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@ -1,4 +1,7 @@
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import os

 import six
--- a/tests/test_notifier.py
+++ b/tests/test_notifier.py
@ -2,7 +2,11 @@

 from datetime import datetime
 import json
-import mock
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 try:
    import unittest2 as unittest
@ -133,7 +137,7 @@ class TestNotifier(unittest.TestCase):
    def test_does_not_run_without_config(self, run, makedirs):
        n = PungiNotifier(None)
        n.send("cmd", foo="bar", baz="quux")
-        self.assertFalse(run.called)
+        run.assert_not_called()

    @mock.patch("pungi.util.translate_path")
    @mock.patch("kobo.shortcuts.run")
@ -146,4 +150,4 @@ class TestNotifier(unittest.TestCase):
        n.send("cmd", **self.data)

        self.assertEqual(run.call_args_list, [self._call("run-notify", "cmd")])
-        self.assertTrue(self.compose.log_warning.called)
+        self.compose.log_warning.assert_called()
--- a/tests/test_orchestrator.py
+++ b/tests/test_orchestrator.py
@ -1,934 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import itertools
-import json
-from functools import wraps
-import operator
-import os
-import shutil
-import subprocess
-from textwrap import dedent
-
-import mock
-import six
-from six.moves import configparser
-
-from parameterized import parameterized
-
-from tests.helpers import BaseTestCase, PungiTestCase, touch, FIXTURE_DIR
-from pungi_utils import orchestrator as o
-
-
-class TestConfigSubstitute(PungiTestCase):
-    def setUp(self):
-        super(TestConfigSubstitute, self).setUp()
-        self.fp = os.path.join(self.topdir, "config.conf")
-
-    @parameterized.expand(
-        [
-            ("hello = 'world'", "hello = 'world'"),
-            ("hello = '{{foo}}'", "hello = 'bar'"),
-            ("hello = '{{  foo}}'", "hello = 'bar'"),
-            ("hello = '{{foo  }}'", "hello = 'bar'"),
-        ]
-    )
-    def test_substitutions(self, initial, expected):
-        touch(self.fp, initial)
-        o.fill_in_config_file(self.fp, {"foo": "bar"})
-        with open(self.fp) as f:
-            self.assertEqual(expected, f.read())
-
-    def test_missing_key(self):
-        touch(self.fp, "hello = '{{unknown}}'")
-        with self.assertRaises(RuntimeError) as ctx:
-            o.fill_in_config_file(self.fp, {})
-        self.assertEqual(
-            "Unknown placeholder 'unknown' in config.conf", str(ctx.exception)
-        )
-
-
-class TestSafeGetList(BaseTestCase):
-    @parameterized.expand(
-        [
-            ("", []),
-            ("foo", ["foo"]),
-            ("foo,bar", ["foo", "bar"]),
-            ("foo  bar", ["foo", "bar"]),
-        ]
-    )
-    def test_success(self, value, expected):
-        cf = configparser.RawConfigParser()
-        cf.add_section("general")
-        cf.set("general", "key", value)
-        self.assertEqual(o._safe_get_list(cf, "general", "key"), expected)
-
-    def test_default(self):
-        cf = configparser.RawConfigParser()
-        cf.add_section("general")
-        self.assertEqual(o._safe_get_list(cf, "general", "missing", "hello"), "hello")
-
-
-class TestComposePart(PungiTestCase):
-    def test_from_minimal_config(self):
-        cf = configparser.RawConfigParser()
-        cf.add_section("test")
-        cf.set("test", "config", "my.conf")
-
-        part = o.ComposePart.from_config(cf, "test", "/tmp/config")
-        deps = "set()" if six.PY3 else "set([])"
-        self.assertEqual(str(part), "test")
-        self.assertEqual(
-            repr(part),
-            "ComposePart('test', '/tmp/config/my.conf', 'READY', "
-            "just_phase=[], skip_phase=[], dependencies=%s)" % deps,
-        )
-        self.assertFalse(part.failable)
-
-    def test_from_full_config(self):
-        cf = configparser.RawConfigParser()
-        cf.add_section("test")
-        cf.set("test", "config", "my.conf")
-        cf.set("test", "depends_on", "base")
-        cf.set("test", "skip_phase", "skip")
-        cf.set("test", "just_phase", "just")
-        cf.set("test", "failable", "yes")
-
-        part = o.ComposePart.from_config(cf, "test", "/tmp/config")
-        deps = "{'base'}" if six.PY3 else "set(['base'])"
-        self.assertEqual(
-            repr(part),
-            "ComposePart('test', '/tmp/config/my.conf', 'WAITING', "
-            "just_phase=['just'], skip_phase=['skip'], dependencies=%s)" % deps,
-        )
-        self.assertTrue(part.failable)
-
-    def test_get_cmd(self):
-        conf = o.Config(
-            "/tgt/", "production", "RC-1.0", "/old", "/cfg", 1234, ["--quiet"]
-        )
-        part = o.ComposePart(
-            "test", "/tmp/my.conf", just_phase=["just"], skip_phase=["skip"]
-        )
-        part.path = "/compose"
-
-        self.assertEqual(
-            part.get_cmd(conf),
-            [
-                "pungi-koji",
-                "--config",
-                "/tmp/my.conf",
-                "--compose-dir",
-                "/compose",
-                "--production",
-                "--label",
-                "RC-1.0",
-                "--just-phase",
-                "just",
-                "--skip-phase",
-                "skip",
-                "--old-compose",
-                "/old/parts",
-                "--koji-event",
-                "1234",
-                "--quiet",
-                "--no-latest-link",
-            ],
-        )
-
-    def test_refresh_status(self):
-        part = o.ComposePart("test", "/tmp/my.conf")
-        part.path = os.path.join(self.topdir)
-        touch(os.path.join(self.topdir, "STATUS"), "FINISHED")
-        part.refresh_status()
-        self.assertEqual(part.status, "FINISHED")
-
-    def test_refresh_status_missing_file(self):
-        part = o.ComposePart("test", "/tmp/my.conf")
-        part.path = os.path.join(self.topdir)
-        part.refresh_status()
-        self.assertEqual(part.status, "DOOMED")
-
-    @parameterized.expand(["FINISHED", "FINISHED_INCOMPLETE"])
-    def test_is_finished(self, status):
-        part = o.ComposePart("test", "/tmp/my.conf")
-        part.status = status
-        self.assertTrue(part.is_finished())
-
-    @parameterized.expand(["STARTED", "WAITING"])
-    def test_is_not_finished(self, status):
-        part = o.ComposePart("test", "/tmp/my.conf")
-        part.status = status
-        self.assertFalse(part.is_finished())
-
-    @mock.patch("pungi_utils.orchestrator.fill_in_config_file")
-    @mock.patch("pungi_utils.orchestrator.get_compose_dir")
-    @mock.patch("kobo.conf.PyConfigParser")
-    def test_setup_start(self, Conf, gcd, ficf):
-        def pth(*path):
-            return os.path.join(self.topdir, *path)
-
-        conf = o.Config(
-            pth("tgt"), "production", "RC-1.0", "/old", pth("cfg"), None, None
-        )
-        part = o.ComposePart("test", "/tmp/my.conf")
-        parts = {"base": mock.Mock(path="/base", is_finished=lambda: True)}
-        Conf.return_value.opened_files = ["foo.conf"]
-
-        part.setup_start(conf, parts)
-
-        self.assertEqual(part.status, "STARTED")
-        self.assertEqual(part.path, gcd.return_value)
-        self.assertEqual(part.log_file, pth("tgt", "logs", "test.log"))
-        self.assertEqual(
-            ficf.call_args_list,
-            [mock.call("foo.conf", {"part-base": "/base", "configdir": pth("cfg")})],
-        )
-        self.assertEqual(
-            gcd.call_args_list,
-            [
-                mock.call(
-                    pth("tgt/parts"),
-                    Conf.return_value,
-                    compose_type="production",
-                    compose_label="RC-1.0",
-                )
-            ],
-        )
-
-    @parameterized.expand(
-        [
-            # Nothing blocking, no change
-            ([], [], o.Status.READY),
-            # Remove last blocker and switch to READY
-            (["finished"], [], o.Status.READY),
-            # Blocker remaining, stay in WAITING
-            (["finished", "block"], ["block"], o.Status.WAITING),
-        ]
-    )
-    def test_unblock_on(self, deps, blockers, status):
-        part = o.ComposePart("test", "/tmp/my.conf", dependencies=deps)
-        part.unblock_on("finished")
-        six.assertCountEqual(self, part.blocked_on, blockers)
-        self.assertEqual(part.status, status)
-
-
-class TestStartPart(PungiTestCase):
-    @mock.patch("subprocess.Popen")
-    def test_start(self, Popen):
-        part = mock.Mock(log_file=os.path.join(self.topdir, "log"))
-        config = mock.Mock()
-        parts = mock.Mock()
-        cmd = ["pungi-koji", "..."]
-
-        part.get_cmd.return_value = cmd
-
-        proc = o.start_part(config, parts, part)
-
-        self.assertEqual(
-            part.mock_calls,
-            [mock.call.setup_start(config, parts), mock.call.get_cmd(config)],
-        )
-        self.assertEqual(proc, Popen.return_value)
-        self.assertEqual(
-            Popen.call_args_list,
-            [mock.call(cmd, stdout=mock.ANY, stderr=subprocess.STDOUT)],
-        )
-
-
-class TestHandleFinished(BaseTestCase):
-    def setUp(self):
-        self.config = mock.Mock()
-        self.linker = mock.Mock()
-        self.parts = {"a": mock.Mock(), "b": mock.Mock()}
-
-    @mock.patch("pungi_utils.orchestrator.update_metadata")
-    @mock.patch("pungi_utils.orchestrator.copy_part")
-    def test_handle_success(self, cp, um):
-        proc = mock.Mock(returncode=0)
-        o.handle_finished(self.config, self.linker, self.parts, proc, self.parts["a"])
-
-        self.assertEqual(
-            self.parts["a"].mock_calls,
-            [mock.call.refresh_status(), mock.call.unblock_on(self.parts["a"].name)],
-        )
-        self.assertEqual(
-            self.parts["b"].mock_calls, [mock.call.unblock_on(self.parts["a"].name)]
-        )
-        self.assertEqual(
-            cp.call_args_list, [mock.call(self.config, self.linker, self.parts["a"])]
-        )
-        self.assertEqual(um.call_args_list, [mock.call(self.config, self.parts["a"])])
-
-    @mock.patch("pungi_utils.orchestrator.block_on")
-    def test_handle_failure(self, bo):
-        proc = mock.Mock(returncode=1)
-        o.handle_finished(self.config, self.linker, self.parts, proc, self.parts["a"])
-
-        self.assertEqual(self.parts["a"].mock_calls, [mock.call.refresh_status()])
-
-        self.assertEqual(
-            bo.call_args_list, [mock.call(self.parts, self.parts["a"].name)]
-        )
-
-
-class TestBlockOn(BaseTestCase):
-    def test_single(self):
-        parts = {"b": o.ComposePart("b", "b.conf", dependencies=["a"])}
-
-        o.block_on(parts, "a")
-
-        self.assertEqual(parts["b"].status, o.Status.BLOCKED)
-
-    def test_chain(self):
-        parts = {
-            "b": o.ComposePart("b", "b.conf", dependencies=["a"]),
-            "c": o.ComposePart("c", "c.conf", dependencies=["b"]),
-            "d": o.ComposePart("d", "d.conf", dependencies=["c"]),
-        }
-
-        o.block_on(parts, "a")
-
-        self.assertEqual(parts["b"].status, o.Status.BLOCKED)
-        self.assertEqual(parts["c"].status, o.Status.BLOCKED)
-        self.assertEqual(parts["d"].status, o.Status.BLOCKED)
-
-
-class TestUpdateMetadata(PungiTestCase):
-    def assertEqualJSON(self, f1, f2):
-        with open(f1) as f:
-            actual = json.load(f)
-        with open(f2) as f:
-            expected = json.load(f)
-        self.assertEqual(actual, expected)
-
-    def assertEqualMetadata(self, expected):
-        expected_dir = os.path.join(FIXTURE_DIR, expected, "compose/metadata")
-        for f in os.listdir(expected_dir):
-            self.assertEqualJSON(
-                os.path.join(self.tgt, "compose/metadata", f),
-                os.path.join(expected_dir, f),
-            )
-
-    @parameterized.expand(["empty-metadata", "basic-metadata"])
-    def test_merge_into_empty(self, fixture):
-        self.tgt = os.path.join(self.topdir, "target")
-
-        conf = o.Config(self.tgt, "production", None, None, None, None, [])
-        part = o.ComposePart("test", "/tmp/my.conf")
-        part.path = os.path.join(FIXTURE_DIR, "DP-1.0-20181001.n.0")
-
-        shutil.copytree(os.path.join(FIXTURE_DIR, fixture), self.tgt)
-
-        o.update_metadata(conf, part)
-
-        self.assertEqualMetadata(fixture + "-merged")
-
-
-class TestCopyPart(PungiTestCase):
-    @mock.patch("pungi_utils.orchestrator.hardlink_dir")
-    def test_copy(self, hd):
-        self.tgt = os.path.join(self.topdir, "target")
-        conf = o.Config(self.tgt, "production", None, None, None, None, [])
-        linker = mock.Mock()
-        part = o.ComposePart("test", "/tmp/my.conf")
-        part.path = os.path.join(FIXTURE_DIR, "DP-1.0-20161013.t.4")
-
-        o.copy_part(conf, linker, part)
-
-        six.assertCountEqual(
-            self,
-            hd.call_args_list,
-            [
-                mock.call(
-                    linker,
-                    os.path.join(part.path, "compose", variant),
-                    os.path.join(self.tgt, "compose", variant),
-                )
-                for variant in ["Client", "Server"]
-            ],
-        )
-
-
-class TestHardlinkDir(PungiTestCase):
-    def test_hardlinking(self):
-        linker = mock.Mock()
-        src = os.path.join(self.topdir, "src")
-        dst = os.path.join(self.topdir, "dst")
-        files = ["file.txt", "nested/deep/another.txt"]
-
-        for f in files:
-            touch(os.path.join(src, f))
-
-        o.hardlink_dir(linker, src, dst)
-
-        six.assertCountEqual(
-            self,
-            linker.queue_put.call_args_list,
-            [mock.call((os.path.join(src, f), os.path.join(dst, f))) for f in files],
-        )
-
-
-class TestCheckFinishedProcesses(BaseTestCase):
-    def test_nothing_finished(self):
-        k1 = mock.Mock(returncode=None)
-        v1 = mock.Mock()
-        processes = {k1: v1}
-
-        six.assertCountEqual(self, o.check_finished_processes(processes), [])
-
-    def test_yields_finished(self):
-        k1 = mock.Mock(returncode=None)
-        v1 = mock.Mock()
-        k2 = mock.Mock(returncode=0)
-        v2 = mock.Mock()
-        processes = {k1: v1, k2: v2}
-
-        six.assertCountEqual(self, o.check_finished_processes(processes), [(k2, v2)])
-
-    def test_yields_failed(self):
-        k1 = mock.Mock(returncode=1)
-        v1 = mock.Mock()
-        processes = {k1: v1}
-
-        six.assertCountEqual(self, o.check_finished_processes(processes), [(k1, v1)])
-
-
-class _Part(object):
-    def __init__(self, name, parent=None, fails=False, status=None):
-        self.name = name
-        self.finished = False
-        self.status = o.Status.WAITING if parent else o.Status.READY
-        if status:
-            self.status = status
-        self.proc = mock.Mock(name="proc_%s" % name, pid=hash(self))
-        self.parent = parent
-        self.fails = fails
-        self.failable = False
-        self.path = "/path/to/%s" % name
-        self.blocked_on = set([parent]) if parent else set()
-
-    def is_finished(self):
-        return self.finished or self.status == "FINISHED"
-
-    def __repr__(self):
-        return "<_Part(%r, parent=%r)>" % (self.name, self.parent)
-
-
-def with_mocks(parts, finish_order, wait_results):
-    """Setup all mocks and create dict with the parts.
-    :param finish_order: nested list: first element contains parts that finish
-                         in first iteration, etc.
-    :param wait_results: list of names of processes that are returned by wait in each
-                         iteration
-    """
-
-    def decorator(func):
-        @wraps(func)
-        def worker(self, lp, update_status, cfp, hf, sp, wait):
-            self.parts = dict((p.name, p) for p in parts)
-            self.linker = lp.return_value.__enter__.return_value
-
-            update_status.side_effect = self.mock_update
-            hf.side_effect = self.mock_finish
-            sp.side_effect = self.mock_start
-
-            finish = [[]]
-            for grp in finish_order:
-                finish.append([(self.parts[p].proc, self.parts[p]) for p in grp])
-
-            cfp.side_effect = finish
-            wait.side_effect = [(self.parts[p].proc.pid, 0) for p in wait_results]
-
-            func(self)
-
-            self.assertEqual(lp.call_args_list, [mock.call("hardlink")])
-
-        return worker
-
-    return decorator
-
-
-@mock.patch("os.wait")
-@mock.patch("pungi_utils.orchestrator.start_part")
-@mock.patch("pungi_utils.orchestrator.handle_finished")
-@mock.patch("pungi_utils.orchestrator.check_finished_processes")
-@mock.patch("pungi_utils.orchestrator.update_status")
-@mock.patch("pungi_utils.orchestrator.linker_pool")
-class TestRunAll(BaseTestCase):
-    def setUp(self):
-        self.maxDiff = None
-        self.conf = mock.Mock(name="global_config")
-        self.calls = []
-
-    def mock_update(self, global_config, parts):
-        self.assertEqual(global_config, self.conf)
-        self.assertEqual(parts, self.parts)
-        self.calls.append("update_status")
-
-    def mock_start(self, global_config, parts, part):
-        self.assertEqual(global_config, self.conf)
-        self.assertEqual(parts, self.parts)
-        self.calls.append(("start_part", part.name))
-        part.status = o.Status.STARTED
-        return part.proc
-
-    @property
-    def sorted_calls(self):
-        """Sort the consecutive calls of the same function based on the argument."""
-
-        def key(val):
-            return val[0] if isinstance(val, tuple) else val
-
-        return list(
-            itertools.chain.from_iterable(
-                sorted(grp, key=operator.itemgetter(1))
-                for _, grp in itertools.groupby(self.calls, key)
-            )
-        )
-
-    def mock_finish(self, global_config, linker, parts, proc, part):
-        self.assertEqual(global_config, self.conf)
-        self.assertEqual(linker, self.linker)
-        self.assertEqual(parts, self.parts)
-        self.calls.append(("handle_finished", part.name))
-        for child in parts.values():
-            if child.parent == part.name:
-                child.status = o.Status.BLOCKED if part.fails else o.Status.READY
-        part.status = "DOOMED" if part.fails else "FINISHED"
-
-    @with_mocks(
-        [_Part("fst"), _Part("snd", parent="fst")], [["fst"], ["snd"]], ["fst", "snd"]
-    )
-    def test_sequential(self):
-        o.run_all(self.conf, self.parts)
-
-        self.assertEqual(
-            self.sorted_calls,
-            [
-                # First iteration starts fst
-                "update_status",
-                ("start_part", "fst"),
-                # Second iteration handles finish of fst and starts snd
-                "update_status",
-                ("handle_finished", "fst"),
-                ("start_part", "snd"),
-                # Third iteration handles finish of snd
-                "update_status",
-                ("handle_finished", "snd"),
-                # Final update of status
-                "update_status",
-            ],
-        )
-
-    @with_mocks([_Part("fst"), _Part("snd")], [["fst", "snd"]], ["fst"])
-    def test_parallel(self):
-        o.run_all(self.conf, self.parts)
-
-        self.assertEqual(
-            self.sorted_calls,
-            [
-                # First iteration starts both fst and snd
-                "update_status",
-                ("start_part", "fst"),
-                ("start_part", "snd"),
-                # Second iteration handles finish of both of them
-                "update_status",
-                ("handle_finished", "fst"),
-                ("handle_finished", "snd"),
-                # Final update of status
-                "update_status",
-            ],
-        )
-
-    @with_mocks(
-        [_Part("1"), _Part("2", parent="1"), _Part("3", parent="1")],
-        [["1"], ["2", "3"]],
-        ["1", "2"],
-    )
-    def test_waits_for_dep_then_parallel_with_simultaneous_end(self):
-        o.run_all(self.conf, self.parts)
-
-        self.assertEqual(
-            self.sorted_calls,
-            [
-                # First iteration starts first part
-                "update_status",
-                ("start_part", "1"),
-                # Second iteration starts 2 and 3
-                "update_status",
-                ("handle_finished", "1"),
-                ("start_part", "2"),
-                ("start_part", "3"),
-                # Both 2 and 3 end in third iteration
-                "update_status",
-                ("handle_finished", "2"),
-                ("handle_finished", "3"),
-                # Final update of status
-                "update_status",
-            ],
-        )
-
-    @with_mocks(
-        [_Part("1"), _Part("2", parent="1"), _Part("3", parent="1")],
-        [["1"], ["3"], ["2"]],
-        ["1", "3", "2"],
-    )
-    def test_waits_for_dep_then_parallel_with_different_end_times(self):
-        o.run_all(self.conf, self.parts)
-
-        self.assertEqual(
-            self.sorted_calls,
-            [
-                # First iteration starts first part
-                "update_status",
-                ("start_part", "1"),
-                # Second iteration starts 2 and 3
-                "update_status",
-                ("handle_finished", "1"),
-                ("start_part", "2"),
-                ("start_part", "3"),
-                # Third iteration sees 3 finish
-                "update_status",
-                ("handle_finished", "3"),
-                # Fourth iteration, 2 finishes
-                "update_status",
-                ("handle_finished", "2"),
-                # Final update of status
-                "update_status",
-            ],
-        )
-
-    @with_mocks(
-        [_Part("fst", fails=True), _Part("snd", parent="fst")], [["fst"]], ["fst"]
-    )
-    def test_blocked(self):
-        o.run_all(self.conf, self.parts)
-
-        self.assertEqual(
-            self.sorted_calls,
-            [
-                # First iteration starts first part
-                "update_status",
-                ("start_part", "fst"),
-                # Second iteration handles fail of first part
-                "update_status",
-                ("handle_finished", "fst"),
-                # Final update of status
-                "update_status",
-            ],
-        )
-
-
-@mock.patch("pungi_utils.orchestrator.get_compose_dir")
-class TestGetTargetDir(BaseTestCase):
-    def test_with_absolute_path(self, gcd):
-        config = {"target": "/tgt", "compose_type": "nightly"}
-        cfg = mock.Mock()
-        cfg.get.side_effect = lambda _, k: config[k]
-        ci = mock.Mock()
-        res = o.get_target_dir(cfg, ci, None, reldir="/checkout")
-        self.assertEqual(res, gcd.return_value)
-        self.assertEqual(
-            gcd.call_args_list,
-            [mock.call("/tgt", ci, compose_type="nightly", compose_label=None)],
-        )
-
-    def test_with_relative_path(self, gcd):
-        config = {"target": "tgt", "compose_type": "nightly"}
-        cfg = mock.Mock()
-        cfg.get.side_effect = lambda _, k: config[k]
-        ci = mock.Mock()
-        res = o.get_target_dir(cfg, ci, None, reldir="/checkout")
-        self.assertEqual(res, gcd.return_value)
-        self.assertEqual(
-            gcd.call_args_list,
-            [
-                mock.call(
-                    "/checkout/tgt", ci, compose_type="nightly", compose_label=None
-                )
-            ],
-        )
-
-
-class TestComputeStatus(BaseTestCase):
-    @parameterized.expand(
-        [
-            ([("FINISHED", False)], "FINISHED"),
-            ([("FINISHED", False), ("STARTED", False)], "STARTED"),
-            ([("FINISHED", False), ("STARTED", False), ("WAITING", False)], "STARTED"),
-            ([("FINISHED", False), ("DOOMED", False)], "DOOMED"),
-            (
-                [("FINISHED", False), ("BLOCKED", True), ("DOOMED", True)],
-                "FINISHED_INCOMPLETE",
-            ),
-            ([("FINISHED", False), ("BLOCKED", False), ("DOOMED", True)], "DOOMED"),
-            ([("FINISHED", False), ("DOOMED", True)], "FINISHED_INCOMPLETE"),
-            ([("FINISHED", False), ("STARTED", False), ("DOOMED", False)], "STARTED"),
-        ]
-    )
-    def test_cases(self, statuses, expected):
-        self.assertEqual(o.compute_status(statuses), expected)
-
-
-class TestUpdateStatus(PungiTestCase):
-    def test_updating(self):
-        os.makedirs(os.path.join(self.topdir, "compose/metadata"))
-        conf = o.Config(
-            self.topdir, "production", "RC-1.0", "/old", "/cfg", 1234, ["--quiet"]
-        )
-        o.update_status(
-            conf,
-            {"1": _Part("1", status="FINISHED"), "2": _Part("2", status="STARTED")},
-        )
-        self.assertFileContent(os.path.join(self.topdir, "STATUS"), "STARTED")
-        self.assertFileContent(
-            os.path.join(self.topdir, "compose/metadata/parts.json"),
-            dedent(
-                """\
-                {
-                  "1": {
-                    "path": "/path/to/1",
-                    "status": "FINISHED"
-                  },
-                  "2": {
-                    "path": "/path/to/2",
-                    "status": "STARTED"
-                  }
-                }
-                """
-            ),
-        )
-
-
-@mock.patch("pungi_utils.orchestrator.get_target_dir")
-class TestPrepareComposeDir(PungiTestCase):
-    def setUp(self):
-        super(TestPrepareComposeDir, self).setUp()
-        self.conf = mock.Mock(name="config")
-        self.main_config = "/some/config"
-        self.compose_info = mock.Mock(name="compose_info")
-
-    def test_new_compose(self, gtd):
-        def mock_get_target(conf, compose_info, label, reldir):
-            self.assertEqual(conf, self.conf)
-            self.assertEqual(compose_info, self.compose_info)
-            self.assertEqual(label, args.label)
-            self.assertEqual(reldir, "/some")
-            touch(os.path.join(self.topdir, "work/global/composeinfo-base.json"), "WOO")
-            return self.topdir
-
-        gtd.side_effect = mock_get_target
-        args = mock.Mock(name="args", spec=["label"])
-        retval = o.prepare_compose_dir(
-            self.conf, args, self.main_config, self.compose_info
-        )
-        self.assertEqual(retval, self.topdir)
-        self.assertFileContent(
-            os.path.join(self.topdir, "compose/metadata/composeinfo.json"), "WOO"
-        )
-        self.assertTrue(os.path.isdir(os.path.join(self.topdir, "logs")))
-        self.assertTrue(os.path.isdir(os.path.join(self.topdir, "parts")))
-        self.assertTrue(os.path.isdir(os.path.join(self.topdir, "work/global")))
-        self.assertFileContent(os.path.join(self.topdir, "STATUS"), "STARTED")
-
-    def test_restarting_compose(self, gtd):
-        args = mock.Mock(name="args", spec=["label", "compose_path"])
-        retval = o.prepare_compose_dir(
-            self.conf, args, self.main_config, self.compose_info
-        )
-        self.assertEqual(gtd.call_args_list, [])
-        self.assertEqual(retval, args.compose_path)
-
-
-class TestLoadPartsMetadata(PungiTestCase):
-    def test_loading(self):
-        touch(
-            os.path.join(self.topdir, "compose/metadata/parts.json"), '{"foo": "bar"}'
-        )
-        conf = mock.Mock(target=self.topdir)
-
-        self.assertEqual(o.load_parts_metadata(conf), {"foo": "bar"})
-
-
-@mock.patch("pungi_utils.orchestrator.load_parts_metadata")
-class TestSetupForRestart(BaseTestCase):
-    def setUp(self):
-        self.conf = mock.Mock(name="global_config")
-
-    def test_restart_ok(self, lpm):
-        lpm.return_value = {
-            "p1": {"status": "FINISHED", "path": "/p1"},
-            "p2": {"status": "DOOMED", "path": "/p2"},
-        }
-        parts = {"p1": _Part("p1"), "p2": _Part("p2", parent="p1")}
-
-        o.setup_for_restart(self.conf, parts, ["p2"])
-
-        self.assertEqual(parts["p1"].status, "FINISHED")
-        self.assertEqual(parts["p1"].path, "/p1")
-        self.assertEqual(parts["p2"].status, "READY")
-        self.assertEqual(parts["p2"].path, None)
-
-    def test_restart_one_blocked_one_ok(self, lpm):
-        lpm.return_value = {
-            "p1": {"status": "DOOMED", "path": "/p1"},
-            "p2": {"status": "DOOMED", "path": "/p2"},
-            "p3": {"status": "WAITING", "path": None},
-        }
-        parts = {
-            "p1": _Part("p1"),
-            "p2": _Part("p2", parent="p1"),
-            "p3": _Part("p3", parent="p2"),
-        }
-
-        o.setup_for_restart(self.conf, parts, ["p1", "p3"])
-
-        self.assertEqual(parts["p1"].status, "READY")
-        self.assertEqual(parts["p1"].path, None)
-        self.assertEqual(parts["p2"].status, "DOOMED")
-        self.assertEqual(parts["p2"].path, "/p2")
-        self.assertEqual(parts["p3"].status, "WAITING")
-        self.assertEqual(parts["p3"].path, None)
-
-    def test_restart_all_blocked(self, lpm):
-        lpm.return_value = {
-            "p1": {"status": "DOOMED", "path": "/p1"},
-            "p2": {"status": "STARTED", "path": "/p2"},
-        }
-        parts = {"p1": _Part("p1"), "p2": _Part("p2", parent="p1")}
-
-        with self.assertRaises(RuntimeError):
-            o.setup_for_restart(self.conf, parts, ["p2"])
-
-        self.assertEqual(parts["p1"].status, "DOOMED")
-        self.assertEqual(parts["p1"].path, "/p1")
-        self.assertEqual(parts["p2"].status, "WAITING")
-        self.assertEqual(parts["p2"].path, None)
-
-
-@mock.patch("atexit.register")
-@mock.patch("kobo.shortcuts.run")
-class TestRunKinit(BaseTestCase):
-    def test_without_config(self, run, register):
-        conf = mock.Mock()
-        conf.getboolean.return_value = False
-
-        o.run_kinit(conf)
-
-        self.assertEqual(run.call_args_list, [])
-        self.assertEqual(register.call_args_list, [])
-
-    @mock.patch.dict("os.environ")
-    def test_with_config(self, run, register):
-        conf = mock.Mock()
-        conf.getboolean.return_value = True
-        conf.get.side_effect = lambda section, option: option
-
-        o.run_kinit(conf)
-
-        self.assertEqual(
-            run.call_args_list,
-            [mock.call(["kinit", "-k", "-t", "kerberos_keytab", "kerberos_principal"])],
-        )
-        self.assertEqual(
-            register.call_args_list, [mock.call(os.remove, os.environ["KRB5CCNAME"])]
-        )
-
-
-@mock.patch.dict("os.environ", {}, clear=True)
-class TestGetScriptEnv(BaseTestCase):
-    def test_without_metadata(self):
-        env = o.get_script_env("/foobar")
-        self.assertEqual(env, {"COMPOSE_PATH": "/foobar"})
-
-    def test_with_metadata(self):
-        compose_dir = os.path.join(FIXTURE_DIR, "DP-1.0-20161013.t.4")
-        env = o.get_script_env(compose_dir)
-        self.maxDiff = None
-        self.assertEqual(
-            env,
-            {
-                "COMPOSE_PATH": compose_dir,
-                "COMPOSE_ID": "DP-1.0-20161013.t.4",
-                "COMPOSE_DATE": "20161013",
-                "COMPOSE_TYPE": "test",
-                "COMPOSE_RESPIN": "4",
-                "COMPOSE_LABEL": "",
-                "RELEASE_ID": "DP-1.0",
-                "RELEASE_NAME": "Dummy Product",
-                "RELEASE_SHORT": "DP",
-                "RELEASE_VERSION": "1.0",
-                "RELEASE_TYPE": "ga",
-                "RELEASE_IS_LAYERED": "",
-            },
-        )
-
-
-class TestRunScripts(BaseTestCase):
-    @mock.patch("pungi_utils.orchestrator.get_script_env")
-    @mock.patch("kobo.shortcuts.run")
-    def test_run_scripts(self, run, get_env):
-        commands = """
-           date
-           env
-           """
-
-        o.run_scripts("pref_", "/tmp/compose", commands)
-
-        self.assertEqual(
-            run.call_args_list,
-            [
-                mock.call(
-                    "date",
-                    logfile="/tmp/compose/logs/pref_0.log",
-                    env=get_env.return_value,
-                ),
-                mock.call(
-                    "env",
-                    logfile="/tmp/compose/logs/pref_1.log",
-                    env=get_env.return_value,
-                ),
-            ],
-        )
-
-
-@mock.patch("pungi.notifier.PungiNotifier")
-class TestSendNotification(BaseTestCase):
-    def test_no_command(self, notif):
-        o.send_notification("/foobar", None, None)
-        self.assertEqual(notif.mock_calls, [])
-
-    @mock.patch("pungi.util.load_config")
-    def test_with_command_and_translate(self, load_config, notif):
-        compose_dir = os.path.join(FIXTURE_DIR, "DP-1.0-20161013.t.4")
-        load_config.return_value = {
-            "translate_paths": [(os.path.dirname(compose_dir), "http://example.com")],
-        }
-        parts = {"foo": mock.Mock()}
-
-        o.send_notification(compose_dir, "handler", parts)
-
-        self.assertEqual(len(notif.mock_calls), 2)
-        self.assertEqual(notif.mock_calls[0], mock.call(["handler"]))
-        _, args, kwargs = notif.mock_calls[1]
-        self.assertEqual(args, ("status-change",))
-        self.assertEqual(
-            kwargs,
-            {
-                "status": "FINISHED",
-                "workdir": compose_dir,
-                "location": "http://example.com/DP-1.0-20161013.t.4",
-                "compose_id": "DP-1.0-20161013.t.4",
-                "compose_date": "20161013",
-                "compose_type": "test",
-                "compose_respin": "4",
-                "compose_label": None,
-                "release_id": "DP-1.0",
-                "release_name": "Dummy Product",
-                "release_short": "DP",
-                "release_version": "1.0",
-                "release_type": "ga",
-                "release_is_layered": False,
-            },
-        )
-        self.assertEqual(load_config.call_args_list, [mock.call(parts["foo"].config)])
--- a/tests/test_osbs_phase.py
+++ b/tests/test_osbs_phase.py
@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import json

 import copy
@ -171,6 +174,7 @@ class OSBSThreadTest(helpers.PungiTestCase):
            self.topdir,
            {
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "translate_paths": [(self.topdir, "http://root")],
            },
        )
@ -575,7 +579,7 @@ class OSBSThreadTest(helpers.PungiTestCase):
        with self.assertRaises(RuntimeError) as ctx:
            self.t.process((self.compose, self.compose.variants["Server"], cfg), 1)

-        self.assertRegex(str(ctx.exception), r"task 12345 failed: see .+ for details")
+        self.assertRegex(str(ctx.exception), r"task failed: 12345. See .+ for details")

    @mock.patch("pungi.phases.osbs.get_file_from_scm")
    @mock.patch("pungi.phases.osbs.kojiwrapper.KojiWrapper")
--- a/tests/test_osbuild_phase.py
+++ b/tests/test_osbuild_phase.py
@ -1,16 +1,81 @@
 # -*- coding: utf-8 -*-

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 import os
+import shutil
+import tempfile
+import unittest

 import koji as orig_koji

 from tests import helpers
+from pungi import compose
 from pungi.phases import osbuild
 from pungi.checks import validate


+class OSBuildPhaseHelperFuncsTest(unittest.TestCase):
+    @mock.patch("pungi.compose.ComposeInfo")
+    def setUp(self, ci):
+        self.tmp_dir = tempfile.mkdtemp()
+        conf = {"translate_paths": [(self.tmp_dir, "http://example.com")]}
+        ci.return_value.compose.respin = 0
+        ci.return_value.compose.id = "RHEL-8.0-20180101.n.0"
+        ci.return_value.compose.date = "20160101"
+        ci.return_value.compose.type = "nightly"
+        ci.return_value.compose.type_suffix = ".n"
+        ci.return_value.compose.label = "RC-1.0"
+        ci.return_value.compose.label_major_version = "1"
+
+        compose_dir = os.path.join(self.tmp_dir, ci.return_value.compose.id)
+        self.compose = compose.Compose(conf, compose_dir)
+        server_variant = mock.Mock(uid="Server", type="variant")
+        client_variant = mock.Mock(uid="Client", type="variant")
+        self.compose.all_variants = {
+            "Server": server_variant,
+            "Client": client_variant,
+        }
+
+    def tearDown(self):
+        shutil.rmtree(self.tmp_dir)
+
+    def test__get_repo_urls(self):
+        repos = [
+            "http://example.com/repo",
+            "Server",
+            {
+                "baseurl": "Client",
+                "package_sets": ["build"],
+            },
+            {
+                "baseurl": "ftp://example.com/linux/repo",
+                "package_sets": ["build"],
+            },
+        ]
+
+        expect = [
+            "http://example.com/repo",
+            "http://example.com/RHEL-8.0-20180101.n.0/compose/Server/$basearch/os",
+            {
+                "baseurl": "http://example.com/RHEL-8.0-20180101.n.0/compose/Client/"
+                + "$basearch/os",
+                "package_sets": ["build"],
+            },
+            {
+                "baseurl": "ftp://example.com/linux/repo",
+                "package_sets": ["build"],
+            },
+        ]
+
+        self.assertEqual(
+            osbuild.OSBuildPhase._get_repo_urls(self.compose, repos), expect
+        )
+
+
 class OSBuildPhaseTest(helpers.PungiTestCase):
    @mock.patch("pungi.phases.osbuild.ThreadPool")
    def test_run(self, ThreadPool):
@ -124,6 +189,94 @@ class OSBuildPhaseTest(helpers.PungiTestCase):
        )
        self.assertNotEqual(validate(compose.conf), ([], []))

+    @mock.patch("pungi.phases.osbuild.ThreadPool")
+    def test_run_with_customizations(self, ThreadPool):
+        cfg = {
+            "name": "test-image",
+            "distro": "rhel-8",
+            "image_types": ["qcow2"],
+            "customizations": {"installation_device": "/dev/sda"},
+        }
+        compose = helpers.DummyCompose(
+            self.topdir,
+            {
+                "osbuild": {"^Everything$": [cfg]},
+                "osbuild_target": "image-target",
+                "osbuild_version": "1",
+                "osbuild_release": "2",
+            },
+        )
+
+        self.assertValidConfig(compose.conf)
+
+        pool = ThreadPool.return_value
+
+        phase = osbuild.OSBuildPhase(compose)
+        phase.run()
+
+        self.assertEqual(len(pool.add.call_args_list), 1)
+        self.assertEqual(
+            pool.queue_put.call_args_list,
+            [
+                mock.call(
+                    (
+                        compose,
+                        compose.variants["Everything"],
+                        cfg,
+                        sorted(compose.variants["Everything"].arches),
+                        "1",
+                        "2",
+                        "image-target",
+                        [self.topdir + "/compose/Everything/$arch/os"],
+                        [],
+                    ),
+                ),
+            ],
+        )
+
+    @mock.patch("pungi.phases.osbuild.ThreadPool")
+    def test_rich_repos(self, ThreadPool):
+        repo = {"baseurl": "http://example.com/repo", "package_sets": ["build"]}
+        cfg = {
+            "name": "test-image",
+            "distro": "rhel-8",
+            "version": "1",
+            "target": "image-target",
+            "arches": ["x86_64"],
+            "image_types": ["qcow2"],
+            "repo": [repo],
+        }
+        compose = helpers.DummyCompose(
+            self.topdir, {"osbuild": {"^Everything$": [cfg]}}
+        )
+
+        self.assertValidConfig(compose.conf)
+
+        pool = ThreadPool.return_value
+
+        phase = osbuild.OSBuildPhase(compose)
+        phase.run()
+
+        self.assertEqual(len(pool.add.call_args_list), 1)
+        self.assertEqual(
+            pool.queue_put.call_args_list,
+            [
+                mock.call(
+                    (
+                        compose,
+                        compose.variants["Everything"],
+                        cfg,
+                        ["x86_64"],
+                        "1",
+                        None,
+                        "image-target",
+                        [repo, self.topdir + "/compose/Everything/$arch/os"],
+                        [],
+                    ),
+                ),
+            ],
+        )
+

 class RunOSBuildThreadTest(helpers.PungiTestCase):
    def setUp(self):
@ -134,6 +287,7 @@ class RunOSBuildThreadTest(helpers.PungiTestCase):
            self.topdir,
            {
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "translate_paths": [(self.topdir, "http://root")],
            },
        )
@ -189,7 +343,13 @@ class RunOSBuildThreadTest(helpers.PungiTestCase):
                "1",  # version
                "15",  # release
                "image-target",
-                [self.topdir + "/compose/Everything/$arch/os"],
+                [
+                    self.topdir + "/compose/Everything/$arch/os",
+                    {
+                        "baseurl": self.topdir + "/compose/Everything/$arch/os",
+                        "package_sets": ["build"],
+                    },
+                ],
                ["x86_64"],
            ),
            1,
@ -211,7 +371,13 @@ class RunOSBuildThreadTest(helpers.PungiTestCase):
                    ["aarch64", "x86_64"],
                    opts={
                        "release": "15",
-                        "repo": [self.topdir + "/compose/Everything/$arch/os"],
+                        "repo": [
+                            self.topdir + "/compose/Everything/$arch/os",
+                            {
+                                "baseurl": self.topdir + "/compose/Everything/$arch/os",
+                                "package_sets": ["build"],
+                            },
+                        ],
                    },
                ),
                mock.call.save_task_id(1234),
--- a/tests/test_ostree_installer_phase.py
+++ b/tests/test_ostree_installer_phase.py
@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 import os

@ -103,6 +106,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
                "release_name": "Fedora",
                "release_version": "Rawhide",
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "runroot_tag": "rrt",
                "image_volid_formats": ["{release_short}-{variant}-{arch}"],
                "translate_paths": [(self.topdir + "/work", "http://example.com/work")],
--- a/tests/test_ostree_phase.py
+++ b/tests/test_ostree_phase.py
@ -2,7 +2,11 @@


 import json
-import mock
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock

 import os

@ -123,6 +127,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
            self.topdir,
            {
                "koji_profile": "koji",
+                "koji_cache": "/tmp",
                "runroot_tag": "rrt",
                "translate_paths": [(self.topdir, "http://example.com")],
            },
--- a/tests/test_ostree_script.py
+++ b/tests/test_ostree_script.py
@ -4,7 +4,10 @@
 import json
 import os

-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 import six
 import yaml

@ -315,7 +318,6 @@ class OstreeTreeScriptTest(helpers.PungiTestCase):

    @mock.patch("kobo.shortcuts.run")
    def test_extra_config_with_keep_original_sources(self, run):
-
        configdir = os.path.join(self.topdir, "config")
        self._make_dummy_config_dir(configdir)
        treefile = os.path.join(configdir, "fedora-atomic-docker-host.json")
--- a/Show More
+++ b/Show More