Improve autodetection of productmd image type for osbuild images

I don't love inferring the type from the filename like this -
it's kinda backwards - but it's an improvement on the current
logic (I don't think 'dvd' is ever currently the correct value
here, I don't think osbuild *can* currently build the type of
image that 'dvd' is meant to indicate). I can't immediately see
any better source of data here (we could use the 'name' or
'package_name' from 'build_info', but those are pretty much
just inputs to the filenames anyway).

Types that are possible in productmd but not covered here are
'cd' (never likely to be used again in Fedora at least, not sure
about RHEL), 'dvd-debuginfo' (again not used in Fedora, may be
used in RHEL), 'ec2', 'kvm' (not sure about those), 'netinst'
(this is a synonym for 'boot', we use 'boot' in practice in
Fedora metadata), 'p2v' and 'rescue' (not sure).

Signed-off-by: Adam Williamson <awilliam@redhat.com>

1860.patch

@@ -1,25 +0,0 @@
-From 3bd28f97b2991cf4e3b4ce9ce34c80cba2bf21ab Mon Sep 17 00:00:00 2001
-From: Lubomír Sedlář <lsedlar@redhat.com>
-Date: Aug 08 2025 11:54:39 +0000
-Subject: repoclosure: Don't fail if cache doesn't exist
-
-
-Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
-
----
-
-diff --git a/pungi/phases/repoclosure.py b/pungi/phases/repoclosure.py
-index 1d3fad0..398802f 100644
---- a/pungi/phases/repoclosure.py
-+++ b/pungi/phases/repoclosure.py
-@@ -136,6 +136,9 @@ def _delete_repoclosure_cache_dirs(compose):
-         pass
- 
-     for top_cache_dir in cache_dirs:
-+        if not os.path.isdir(top_cache_dir):
-+            # Skip if the cache doesn't exist.
-+            continue
-         for name in os.listdir(top_cache_dir):
-             if name.startswith(compose.compose_id):
-                 cache_path = os.path.join(top_cache_dir, name)
-

doc/_static/phases.svg

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="698.46503"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   height="367.16599"
+   xmlns:cc="http://creativecommons.org/ns#"
-   viewBox="0 0 698.46506 367.16599"
+   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"
    id="svg2"
    version="1.1"
-   inkscape:version="1.4 (e7c3feb1, 2024-10-09)"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
    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"
@@ -24,16 +24,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.5268051"
+     inkscape:zoom="1.5"
-     inkscape:cx="281.30637"
+     inkscape:cx="9.4746397"
-     inkscape:cy="222.68723"
+     inkscape:cy="58.833855"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1920"
+     inkscape:window-width="2560"
-     inkscape:window-height="1027"
+     inkscape:window-height="1376"
      inkscape:window-x="0"
-     inkscape:window-y="25"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      units="px"
      inkscape:document-rotation="0"
@@ -43,10 +43,7 @@
      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
@@ -73,6 +70,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -105,7 +103,7 @@
            style="font-size:13.1479px;line-height:1.25">Pkgset</tspan></text>
     </g>
     <g
-       transform="translate(141.04531,-80.817124)"
+       transform="translate(58.253953,-80.817124)"
        id="g3398">
       <rect
          y="553.98242"
@@ -153,191 +151,177 @@
     <path
        inkscape:connector-curvature="0"
        id="path3642"
-       d="M 100.90864,859.8891 H 734.73997"
+       d="M 100.90864,859.8891 H 654.22706"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.25724px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" />
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.17467px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" />
     <g
-       id="g10">
+       transform="translate(26.249988)"
-      <rect
+       id="g262">
-         transform="matrix(0,1,1,0,0,0)"
+      <g
-         y="205.63933"
+         id="g234">
-         x="872.67383"
+        <rect
-         height="137.98026"
+           transform="matrix(0,1,1,0,0,0)"
-         width="26.295755"
+           y="179.38934"
-         id="rect3342"
+           x="872.67383"
-         style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:0.772066px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+           height="162.72726"
-      <text
+           width="26.295755"
-         id="text3364"
+           id="rect3342"
-         y="890.72327"
+           style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:0.838448px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-         x="207.94366"
+        <text
-         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"
+           id="text3364"
-         xml:space="preserve"><tspan
-           style="font-size:13.1479px;line-height:1.25"
            y="890.72327"
-           x="207.94366"
+           x="181.69368"
-           id="tspan3366"
+           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"
-           sodipodi:role="line">Buildinstall</tspan></text>
+           xml:space="preserve"><tspan
-    </g>
+             style="font-size:13.1479px;line-height:1.25"
-    <g
+             y="890.72327"
-       id="g3639"
+             x="181.69368"
-       transform="translate(102.17568,-0.34404039)">
+             id="tspan3366"
-      <rect
+             sodipodi:role="line">Buildinstall</tspan></text>
-         transform="matrix(0,1,1,0,0,0)"
+      </g>
-         y="103.28194"
+      <g
-         x="905.2099"
+         id="g3639"
-         height="54.197887"
+         transform="translate(75.925692,-0.34404039)">
-         width="26.295755"
+        <rect
-         id="rect3344"
+           transform="matrix(0,1,1,0,0,0)"
-         style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+           y="103.28194"
-      <text
+           x="905.2099"
-         id="text3368"
+           height="54.197887"
-         y="923.25934"
+           width="26.295755"
-         x="106.1384"
+           id="rect3344"
-         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"
+           style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-         xml:space="preserve"><tspan
+        <text
-           style="font-size:13.1479px;line-height:1.25"
+           id="text3368"
            y="923.25934"
            x="106.1384"
-           id="tspan3370"
+           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"
-           sodipodi:role="line">Gather</tspan></text>
+           xml:space="preserve"><tspan
-    </g>
+             style="font-size:13.1479px;line-height:1.25"
-    <g
+             y="923.25934"
-       transform="translate(42.17571,32.494534)"
+             x="106.1384"
-       id="g3647">
+             id="tspan3370"
-      <g
+             sodipodi:role="line">Gather</tspan></text>
-         id="g3644">
-        <rect
-           style="fill:#ad7fa8;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="rect3346"
-           width="26.295755"
-           height="72.729973"
-           x="905.2099"
-           y="162.92607"
-           transform="matrix(0,1,1,0,0,0)" />
       </g>
-      <text
+      <g
-         id="text3372"
+         transform="translate(15.925722,63.405928)"
-         y="923.25934"
+         id="g3647">
-         x="165.23042"
+        <g
-         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"
+           id="g3644">
-         xml:space="preserve"><tspan
+          <rect
-           style="font-size:13.1479px;line-height:1.25"
+             style="fill:#ad7fa8;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             id="rect3346"
+             width="26.295755"
+             height="72.729973"
+             x="905.2099"
+             y="162.92607"
+             transform="matrix(0,1,1,0,0,0)" />
+        </g>
+        <text
+           id="text3372"
            y="923.25934"
            x="165.23042"
-           id="tspan3374"
+           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"
-           sodipodi:role="line">ExtraFiles</tspan></text>
+           xml:space="preserve"><tspan
-    </g>
+             style="font-size:13.1479px;line-height:1.25"
-    <g
+             y="923.25934"
-       transform="translate(23.42572,-0.34404039)"
+             x="165.23042"
-       id="g3658">
+             id="tspan3374"
-      <rect
+             sodipodi:role="line">ExtraFiles</tspan></text>
-         transform="matrix(0,1,1,0,0,0)"
+      </g>
-         y="241.10229"
+      <g
-         x="905.2099"
+         transform="translate(-2.824268,-0.34404039)"
-         height="78.636055"
+         id="g3658">
-         width="26.295755"
+        <rect
-         id="rect3348"
+           transform="matrix(0,1,1,0,0,0)"
-         style="fill:#e9b96e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+           y="241.10229"
-      <text
+           x="905.2099"
-         id="text3376"
+           height="78.636055"
-         y="921.86945"
+           width="26.295755"
-         x="243.95874"
+           id="rect3348"
-         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"
+           style="fill:#e9b96e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-         xml:space="preserve"><tspan
+        <text
-           style="font-size:13.1479px;line-height:1.25"
+           id="text3376"
            y="921.86945"
            x="243.95874"
-           id="tspan3378"
+           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"
-           sodipodi:role="line">Createrepo</tspan></text>
+           xml:space="preserve"><tspan
-    </g>
+             style="font-size:13.1479px;line-height:1.25"
-    <g
+             y="921.86945"
-       id="g3408"
+             x="243.95874"
-       transform="translate(-48.38832,300.30474)">
+             id="tspan3378"
-      <rect
+             sodipodi:role="line">Createrepo</tspan></text>
-         transform="matrix(0,1,1,0,0,0)"
+      </g>
-         y="253.37347"
+      <g
-         x="670.65399"
+         id="g3408"
-         height="137.77563"
+         transform="translate(-74.638308,113.77258)">
-         width="26.295755"
+        <rect
-         id="rect3350-3"
+           transform="matrix(0,1,1,0,0,0)"
-         style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1.60245px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+           y="254.60153"
-      <text
+           x="823.54675"
-         id="text3380-2"
+           height="53.653927"
-         y="688.04315"
+           width="26.295755"
-         x="256.90588"
+           id="rect3350-3"
-         style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-         xml:space="preserve"><tspan
+        <text
-           style="font-size:13.1479px;line-height:1.25"
+           id="text3380-2"
-           id="tspan3406"
+           y="840.3219"
            x="256.90588"
-           y="688.04315"
+           style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           sodipodi:role="line">OSTree</tspan></text>
+           xml:space="preserve"><tspan
+             style="font-size:13.1479px;line-height:1.25"
+             id="tspan3406"
+             sodipodi:role="line"
+             x="256.90588"
+             y="840.3219">OSTree</tspan></text>
+      </g>
+      <g
+         transform="translate(-252.46536,-85.861863)"
+         id="g288">
+        <g
+           transform="translate(0.56706579)"
+           id="g3653">
+          <rect
+             style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             id="rect3428"
+             width="26.295755"
+             height="101.85102"
+             x="1022.637"
+             y="490.33765"
+             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="492.642"
+             y="1039.4121"
+             id="text3430"><tspan
+               id="tspan283"
+               sodipodi:role="line"
+               x="492.642"
+               y="1039.4121"
+               style="font-size:12px;line-height:0">OSTreeInstaller</tspan></text>
+        </g>
+      </g>
     </g>
     <rect
-       style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1.48564px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="matrix(0,1,1,0,0,0)"
-       id="rect3428"
+       style="fill:#e9b96e;fill-rule:evenodd;stroke:none;stroke-width:1.85901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       width="26.295755"
+       id="rect3338-1"
-       height="224.79666"
+       width="90.874992"
-       x="1122.0793"
+       height="115.80065"
-       y="351.26718"
+       x="872.67383"
-       transform="matrix(0,1,1,0,0,0)" />
+       y="486.55563" />
     <text
-       xml:space="preserve"
+       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"
-       x="355.4136"
+       xml:space="preserve"><tspan
-       y="1140.0824"
+         style="font-size:13.1475px;line-height:1.25"
-       id="text3430"><tspan
+         id="tspan3391"
-         id="tspan283"
          sodipodi:role="line"
-         x="355.4136"
+         x="489.56451"
-         y="1140.0824"
+         y="921.73846">ImageChecksum</tspan></text>
-         style="font-size:12px;line-height:0">OSTreeInstaller</tspan></text>
     <g
-       id="g11">
+       transform="translate(-42.209584,-80.817124)"
-      <rect
-         style="fill:#edd400;fill-rule:evenodd;stroke:none;stroke-width:1.90661px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="rect3428-5"
-         width="26.295755"
-         height="370.24628"
-         x="1155.5499"
-         y="205.91063"
-         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="208.21498"
-         y="1172.3251"
-         id="text3430-3"><tspan
-           id="tspan283-5"
-           sodipodi:role="line"
-           x="208.21498"
-           y="1172.3251"
-           style="font-size:12px;line-height:0">OSTreeContainer</tspan></text>
-    </g>
-    <g
-       id="g9"
-       transform="translate(-23.616254)">
-      <rect
-         transform="matrix(0,1,1,0,0,0)"
-         style="fill:#e9b96e;fill-rule:evenodd;stroke:none;stroke-width:0.898355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="rect3338-1"
-         width="25.155075"
-         height="110.86161"
-         x="872.67383"
-         y="602.95026" />
-      <text
-         id="text3384-0"
-         y="889.42767"
-         x="605.95917"
-         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="605.95917"
-           y="889.42767">ImageChecksum</tspan></text>
-    </g>
-    <g
-       transform="translate(-68.341107,-80.817124)"
        id="g3458">
       <rect
          transform="matrix(0,1,1,0,0,0)"
@@ -359,9 +343,32 @@
            sodipodi:role="line"
            style="font-size:13.1479px;line-height:1.25">Createiso</tspan></text>
     </g>
+    <g
+       id="g3453"
+       transform="translate(-42.466031,-84.525321)">
+      <rect
+         transform="matrix(0,1,1,0,0,0)"
+         y="420.39337"
+         x="989.65247"
+         height="101.85102"
+         width="26.295755"
+         id="rect3352"
+         style="fill:#73d216;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <text
+         id="text3388"
+         y="1006.4276"
+         x="422.69772"
+         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="1006.4276"
+           x="422.69772"
+           id="tspan3390"
+           sodipodi:role="line"
+           style="font-size:13.1479px;line-height:1.25">LiveImages</tspan></text>
+    </g>
     <g
        id="g3448"
-       transform="translate(-68.597554,-120.23498)">
+       transform="translate(-42.466031,-88.485966)">
       <rect
          transform="matrix(0,1,1,0,0,0)"
          y="420.39337"
@@ -384,7 +391,7 @@
     </g>
     <g
        id="g3443"
-       transform="translate(-69.304646,-124.55121)">
+       transform="translate(-43.173123,-92.80219)">
       <rect
          style="fill:#edd400;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          id="rect3422"
@@ -405,31 +412,27 @@
            y="1079.6111"
            style="font-size:13.1479px;line-height:1.25">LiveMedia</tspan></text>
     </g>
-    <g
+    <rect
-       id="g8"
+       style="fill:#c17d11;fill-rule:evenodd;stroke:none;stroke-width:1.48416px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(-26.131523,-31.749016)">
+       id="rect290"
-      <rect
+       width="26.295755"
-         style="fill:#c17d11;fill-rule:evenodd;stroke:none;stroke-width:1.48416px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       height="224.35098"
-         id="rect290"
+       x="1063.5973"
-         width="26.295755"
+       y="378.43698"
-         height="224.35098"
+       transform="matrix(0,1,1,0,0,0)" />
-         x="1091.7223"
+    <text
-         y="378.43698"
+       xml:space="preserve"
-         transform="matrix(0,1,1,0,0,0)" />
+       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"
-      <text
+       x="380.74133"
-         xml:space="preserve"
+       y="1080.3723"
-         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"
+       id="text294"><tspan
+         y="1080.3723"
          x="380.74133"
-         y="1106.6223"
+         sodipodi:role="line"
-         id="text294"><tspan
+         id="tspan301"
-           y="1106.6223"
+         style="font-size:12px;line-height:0">OSBS</tspan></text>
-           x="380.74133"
-           sodipodi:role="line"
-           id="tspan301"
-           style="font-size:12px;line-height:0">OSBS</tspan></text>
-    </g>
     <g
-       transform="translate(-97.065065,-82.792165)"
+       transform="translate(-70.933542,-51.043149)"
        id="g3819">
       <rect
          style="fill:#73d216;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -452,33 +455,51 @@
            id="tspan3812">ExtraIsos</tspan></text>
     </g>
     <g
-       id="g7"
+       id="g1031"
-       transform="translate(-26.131523,-31.749016)">
+       transform="translate(-40.740337,29.23522)">
       <rect
-         y="377.92242"
+         transform="matrix(0,1,1,0,0,0)"
-         x="1122.3463"
+         style="fill:#5ed4ec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         height="224.24059"
+         id="rect206"
          width="26.295755"
-         id="rect87"
+         height="102.36562"
-         style="fill:#5ed4ec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.48006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         x="1066.8611"
-         transform="matrix(0,1,1,0,0,0)" />
+         y="418.66275" />
       <text
-         xml:space="preserve"
+         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"
-         x="380.7789"
+         xml:space="preserve"><tspan
-         y="1140.3958"
+           y="1084.9105"
-         id="text91"><tspan
+           x="421.51923"
-           style="font-size:13.1479px;line-height:1.25"
+           id="tspan208"
            sodipodi:role="line"
-           id="tspan89"
+           style="font-size:13.1479px;line-height:1.25">Repoclosure</tspan></text>
-           x="380.7789"
-           y="1140.3958">Repoclosure</tspan></text>
     </g>
+    <rect
+       y="377.92242"
+       x="1096.0963"
+       height="224.24059"
+       width="26.295755"
+       id="rect87"
+       style="fill:#5ed4ec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.48006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       transform="matrix(0,1,1,0,0,0)" />
+    <text
+       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"
+       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>
     <g
-       id="g206"
+       id="g206">
-       transform="translate(-26.131523,-33.624015)">
       <rect
-         style="fill:#fcd9a4;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00033px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         style="fill:#fcaf3e;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"
@@ -495,49 +516,26 @@
            x="380.23166"
            sodipodi:role="line"
            id="tspan301-5"
-           style="font-size:12px;line-height:0">KiwiBuild</tspan></text>
+           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:2.42607px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       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="180.25586"
+       width="88.544876"
        height="115.80065"
-       x="873.67194"
+       x="970.31763"
-       y="460.4241" />
+       y="486.55563" />
     <text
        id="text3384-0-6"
-       y="967.06702"
+       y="1018.2172"
-       x="467.91034"
+       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="467.91034"
+         x="489.56451"
-         y="967.06702">ImageContainer</tspan></text>
+         y="1018.2172">ImageContainer</tspan></text>
-    <g
-       id="g206-1"
-       transform="translate(-26.177813,-3.0471625)">
-      <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>
   </g>
 </svg>

doc/conf.py

@@ -51,9 +51,9 @@ copyright = "2016, Red Hat, Inc."
 # built documents.
 #
 # The short X.Y version.
-version = "4.10"
+version = "4.5"
 # The full version, including alpha/beta/rc tags.
-release = "4.10.1"
+release = "4.5.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/configuration.rst

@@ -292,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 some phases generating images. Currently that
+    This format will be used for all phases generating images. Currently that
-    means ``createiso``, ``buildinstall`` and ``ostree_installer``.
+    means ``createiso``, ``live_images`` and ``buildinstall``.
 
     Available extra keys are:
      * ``disc_num``
@@ -323,6 +323,7 @@ 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
 
@@ -350,10 +351,48 @@ 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
@@ -629,10 +668,6 @@ Options
       * ``squashfs_only`` -- *bool* (default ``False``) pass the --squashfs_only to Lorax.
       * ``configuration_file`` -- (:ref:`scm_dict <scm_support>`) (default empty) pass the
         specified configuration file to Lorax using the -c option.
-      * ``rootfs_type`` -- *string* (default empty) pass the ``--rootfs-type``
-        option to Lorax with the provided value. If not specified, no type is
-        specified to Lorax, which will choose whatever default it is configured
-        with.
 **lorax_extra_sources**
     (*list*) -- a variant/arch mapping with urls for extra source repositories
     added to Lorax command line. Either one repo or a list can be specified.
@@ -1007,8 +1042,6 @@ Example
    to track decisions.
 
 
-.. _koji-settings:
-
 Koji Settings
 =============
 
@@ -1023,11 +1056,6 @@ Options
     to set up your Koji client profile. In the examples, the profile name is
     "koji", which points to Fedora's koji.fedoraproject.org.
 
-**koji_cache**
-    (*str*) -- koji cache directory. Setting this causes Pungi to download
-    packages over HTTP into a cache, which is used in lieu of the Koji profile's
-    ``topdir`` setting. See :doc:`koji` for details on this behavior.
-
 **global_runroot_method**
     (*str*) -- global runroot method to use. If ``runroot_method`` is set
     per Pungi phase using a dictionary, this option defines the default
@@ -1291,7 +1319,7 @@ Options
     (*int|str*) -- how much free space should be left on each disk. The format
     is the same as for ``iso_size`` option.
 
-**iso_hfs_ppc64le_compatible** = False
+**iso_hfs_ppc64le_compatible** = True
     (*bool*) -- when set to False, the Apple/HFS compatibility is turned off
     for ppc64le ISOs. This option only makes sense for bootable products, and
     affects images produced in *createiso* and *extra_isos* phases.
@@ -1340,8 +1368,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 Media and Image Build
+Common options for Live Images, 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
@@ -1357,12 +1385,14 @@ 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
@@ -1371,6 +1401,7 @@ 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
@@ -1380,14 +1411,44 @@ 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. It
+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
 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
 ===================
 
@@ -1543,83 +1604,6 @@ 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.
-    * ``version`` -- (*str*) override version. Follows the same rules as
-      described in :ref:`automatic versioning <auto-version>`.
-    * ``repo_releasever`` -- (*str*) Override default releasever of the output
-      image.
-    * ``manifest_type`` -- the image type that is put into the manifest by
-      pungi. If not supplied, an autodetected value will be provided. It may or
-      may not make sense.
-    * ``use_buildroot_repo = False`` -- (*bool*) whether the task should
-      automatically enable buildroot repository corresponding to the used
-      target.
-
-    The options can be set either for the specific image, or at the phase level
-    (see below). Version also falls back to ``global_version``.
-
-**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.
-
-**kiwibuild_version**
-    (*str*) -- overide version for all kiwibuild tasks.
-
-**kiwibuild_repo_releasever**
-    (*str*) -- override releasever for all kiwibuild tasks.
-
-**kiwibuild_use_buildroot_repo**
-    (*bool*) -- set enablement of a buildroot repo for all kiwibuild tasks.
-
-
 OSBuild Composer for building images
 ====================================
 
@@ -1675,10 +1659,6 @@ OSBuild Composer for building images
     * ``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
@@ -1726,102 +1706,6 @@ OSBuild Composer for building images
    arch.
 
 
-Image Builder Settings
-======================
-
-**imagebuilder**
-    (*dict*) -- configuration for building images with the ``koji-image-builder``
-    Koji plugin. Pungi will trigger a Koji task which will build the image with
-    the given configuration using the ``image-builder`` executable in the build
-    root.
-
-    Format: ``{variant_uid_regex: [{...}]}``.
-
-    Required keys in the configuration dict:
-
-    * ``name`` -- name of the Koji package
-    * ``types`` -- a list with a single image type string representing
-      the image type to build (e.g. ``qcow2``). Only a single image type
-      can be provided as an argument.
-
-    Optional keys:
-
-    * ``target`` -- which build target to use for the task. Either this option,
-      the global ``imagebuilder_target``, or ``global_target`` is required.
-    * ``version`` -- version for the final build (as a string). This option is
-      required if the global ``imagebuilder_version`` or its ``global_version``
-      equivalent are not specified.
-    * ``release`` -- release part of the final NVR. If neither this option nor
-      the global ``imagebuilder_release`` nor its ``global_release`` equivalent
-      are set, Koji will automatically generate a value.
-    * ``repos`` -- a list of repositories from which to consume packages for
-      building the image. By default only the variant repository is used.
-      The list items use the following formats:
-
-      * String with just the repository URL.
-      * Variant ID in the current compose.
-
-    * ``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.
-
-    * ``seed`` -- An integer that can be used to make builds more reproducible.
-      When ``image-builder`` builds images various bits and bobs are generated
-      with a PRNG (partition uuids, etc). Pinning the seed with this argument
-      or ``imagebuilder_seed`` to do so globally will make builds use the same
-      random values each time. Note that using ``seed`` requires the Koji side
-      to have at least ``koji-image-builder >= 7`` deployed.
-
-    * ``scratch`` -- A boolean to instruct ``koji-image-builder`` to perform scratch
-      builds. This might have implications on garbage collection within the ``koji``
-      instance you're targeting. Can also be set globally through
-      ``imagebuilder_scratch``.
-
-    * ``ostree`` -- A dictionary describing where to get ``ostree`` content when
-      applicable. The dictionary contains the following keys:
-
-        * ``url`` -- URL of the repository that's used to fetch the parent
-          commit from.
-        * ``ref`` -- Name of an ostree branch or tag
-
-    * ``blueprint`` -- A dictionary with a blueprint to use for the
-      image build. Blueprints can customize images beyond their initial definition.
-      For the list of supported customizations, see external
-      `Documentation <https://osbuild.org/docs/user-guide/blueprint-reference/>`__
-
-.. note::
-   There is initial support for having this task as failable without aborting
-   the whole compose. This can be enabled by setting ``"failable": ["*"]`` in
-   the config for the image. It is an on/off switch without granularity per
-   arch.
-
-
-Example Config
---------------
-::
-
-    imagebuilder_target = 'f43-image-builder'
-    imagebuilder_seed = 43
-    imagebuilder_scratch = True
-
-    imagebuilder = {
-        "^IoT$": [
-          {
-            "name": "%s-raw" % release_name,
-            "types": ["iot-raw-xz"],
-            "arches": ["x86_64"], #, "aarch64"],
-            "repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"],
-            "ostree": {
-               "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/",
-               "ref": "fedora/rawhide/$arch/iot",
-            },
-            "subvariant": "IoT",
-            "failable": ["*"],
-          },
-        ]
-    }
-
-
 Image container
 ===============
 
@@ -1882,16 +1766,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 variant. The format should
+    (*dict*) -- a mapping of configuration for each. The format should be
-    be ``{variant_uid_regex: config_dict}``. It is possible to use a list of
+    ``{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 a dict of
+    * ``repo`` -- (*str|dict|[str|dict]*) repos specified by URL or variant UID
-      repo options, ``baseurl`` is required in the dict.
+      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:
@@ -1933,11 +1817,13 @@ 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
@@ -1953,88 +1839,6 @@ 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.
-    * ``subvariant`` -- (*str*) The subvariant value to be used in the metadata
-      for the image. Also used in the image's filename, unless overridden by
-      ``name``. Defaults to being the same as the variant. If building more
-      than one ostree container in a variant, each must have a unique
-      subvariant.
-    * ``name`` -- (*str*) The base for the image's filename. To produce the
-      complete filename, the image's architecture, the version string, and the
-      format suffix are appended to this. Defaults to the value of
-      ``release_short`` and the subvariant, joined by a dash.
-
-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
 =========================
 
@@ -2385,9 +2189,9 @@ Miscellaneous Settings
     format string accepting ``%(variant_name)s`` and ``%(arch)s`` placeholders.
 
 **symlink_isos_to**
-    (*str*) -- If set, the ISO files from ``buildinstall`` and ``createiso``
+    (*str*) -- If set, the ISO files from ``buildinstall``, ``createiso`` and
-    phases will be put into this destination, and a symlink pointing to this
+    ``live_images`` phases will be put into this destination, and a symlink
-    location will be created in actual compose directory.
+    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

doc/examples.rst

@@ -294,6 +294,30 @@ 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",
@@ -319,20 +343,6 @@ 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": {

doc/koji.rst

@@ -28,8 +28,7 @@ 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. To enable this behavior, set the
+cache, and consume them from there.
-:ref:`koji_cache <koji-settings>` option in the compose configuration.
 
 The local cache has similar structure to what is on the Koji volume.
 
@@ -44,8 +43,7 @@ If it doesn't exist, it will be downloaded from Koji (by replacing the
     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 hard- or softlinked from this cache directory
+The packages can be hardlinked from this cache directory.
-(``/mnt/compose/cache`` in the example).
 
 
 Cleanup

doc/phases.rst

@@ -112,24 +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
 -------
 
 Similarly to image build, this phases creates a koji `osbuild` task. In the
 background it uses OSBuild Composer to create images.
 
-ImageBuilder
-------------
-
-Similarly to image build, this phases creates a koji `imageBuilderBuild`
-task. In the background it uses `image-builder` to create images.
-
 OSBS
 ----
 

doc/scm_support.rst

@@ -18,7 +18,6 @@ which can contain following keys.
   * ``cvs`` -- copies files from a CVS repository
   * ``rpm`` -- copies files from a package in the compose
   * ``koji`` -- downloads archives from a given build in Koji build system
-  * ``container-image`` -- downloads an artifact from a container registry
 
 * ``repo``
 
@@ -86,24 +85,6 @@ For ``extra_files`` phase either key is valid and should be chosen depending on
 what the actual use case.
 
 
-``container-image`` example
----------------------------
-
-Example of pulling a container image into the compose. ::
-
-    {
-        # Pull a container into an oci-archive tar file
-        "scm": "container-image",
-        # This is the pull spec including tag. It is passed directly to skopeo
-        # copy with no modification.
-        "repo": "docker://registry.access.redhat.com/ubi9/ubi-minimal:latest",
-        # Key `file` is required, but the value is ignored.
-        "file": "",
-        # Optional subdirectory under Server/<arch>/os
-        "target": "containers",
-    }
-
-
 Caveats
 -------
 

pungi/__init__.py

@@ -16,8 +16,7 @@ def get_full_version():
         proc = subprocess.Popen(
             ["git", "--git-dir=%s/.git" % location, "describe", "--tags"],
             stdout=subprocess.PIPE,
-            text=True,
+            universal_newlines=True,
-            errors="replace",
         )
         output, _ = proc.communicate()
         return re.sub(r"-1.fc\d\d?", "", output.strip().replace("pungi-", ""))
@@ -25,7 +24,7 @@ def get_full_version():
         import subprocess
 
         proc = subprocess.Popen(
-            ["rpm", "-q", "pungi"], stdout=subprocess.PIPE, text=True, errors="replace"
+            ["rpm", "-q", "pungi"], stdout=subprocess.PIPE, universal_newlines=True
         )
         (output, err) = proc.communicate()
         if not err:

pungi/arch.py

@@ -93,11 +93,6 @@ def split_name_arch(name_arch):
 
 def is_excluded(package, arches, logger=None):
     """Check if package is excluded from given architectures."""
-    if any(
-        getBaseArch(exc_arch) == 'x86_64' for exc_arch in package.exclusivearch
-    ) and 'x86_64_v2' not in package.exclusivearch:
-        package.exclusivearch.append('x86_64_v2')
-
     if package.excludearch and set(package.excludearch) & set(arches):
         if logger:
             logger.debug(

pungi/arch_utils.py

@@ -34,8 +34,6 @@ arches = {
     "x86_64": "athlon",
     "amd64": "x86_64",
     "ia32e": "x86_64",
-    # x86-64-v2
-    "x86_64_v2": "noarch",
     # ppc64le
     "ppc64le": "noarch",
     # ppc
@@ -84,8 +82,6 @@ arches = {
     "sh3": "noarch",
     # itanium
     "ia64": "noarch",
-    # riscv64
-    "riscv64": "noarch",
 }
 
 #  Will contain information parsed from /proc/self/auxv via _parse_auxv().

pungi/checks.py

@@ -42,6 +42,7 @@ import platform
 import re
 
 import jsonschema
+import six
 from kobo.shortcuts import force_list
 from pungi.phases import PHASES_NAMES
 from pungi.runroot import RUNROOT_TYPES
@@ -235,8 +236,8 @@ def validate(config, offline=False, schema=None):
             schema,
             {
                 "array": (tuple, list),
-                "regex": str,
+                "regex": six.string_types,
-                "url": str,
+                "url": six.string_types,
             },
         )
     errors = []
@@ -265,28 +266,6 @@ def validate(config, offline=False, schema=None):
             if error.validator in ("anyOf", "oneOf"):
                 for suberror in error.context:
                     errors.append("    Possible reason: %s" % suberror.message)
-
-    # Resolve container tags in extra_files
-    tag_resolver = util.ContainerTagResolver(offline=offline)
-    if config.get("extra_files"):
-        for _, arch_dict in config["extra_files"]:
-            for value in arch_dict.values():
-                if isinstance(value, dict):
-                    _resolve_container_tag(value, tag_resolver)
-                elif isinstance(value, list):
-                    for subinstance in value:
-                        _resolve_container_tag(subinstance, tag_resolver)
-    if config.get("extra_isos"):
-        for cfgs in config["extra_isos"].values():
-            if not isinstance(cfgs, list):
-                cfgs = [cfgs]
-            for cfg in cfgs:
-                if isinstance(cfg.get("extra_files"), dict):
-                    _resolve_container_tag(cfg["extra_files"], tag_resolver)
-                elif isinstance(cfg.get("extra_files"), list):
-                    for c in cfg["extra_files"]:
-                        _resolve_container_tag(c, tag_resolver)
-
     return (errors + _validate_requires(schema, config, CONFIG_DEPS), warnings)
 
 
@@ -483,7 +462,7 @@ def _extend_with_default_and_alias(validator_class, offline=False):
             return isinstance(instance, (tuple, list))
 
         def is_string_type(checker, instance):
-            return isinstance(instance, str)
+            return isinstance(instance, six.string_types)
 
         kwargs["type_checker"] = validator_class.TYPE_CHECKER.redefine_many(
             {"array": is_array, "regex": is_string_type, "url": is_string_type}
@@ -555,18 +534,6 @@ def make_schema():
             "str_or_scm_dict": {
                 "anyOf": [{"type": "string"}, {"$ref": "#/definitions/scm_dict"}]
             },
-            "extra_file": {
-                "type": "object",
-                "properties": {
-                    "scm": {"type": "string"},
-                    "repo": {"type": "string"},
-                    "branch": {"$ref": "#/definitions/optional_string"},
-                    "file": {"$ref": "#/definitions/strings"},
-                    "dir": {"$ref": "#/definitions/strings"},
-                    "target": {"type": "string"},
-                },
-                "additionalProperties": False,
-            },
             "repo_dict": {
                 "type": "object",
                 "properties": {
@@ -586,6 +553,26 @@ 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,
+            },
             "osbs_config": {
                 "type": "object",
                 "properties": {
@@ -621,7 +608,6 @@ def make_schema():
             "release_discinfo_description": {"type": "string"},
             "treeinfo_version": {"type": "string"},
             "compose_type": {"type": "string", "enum": COMPOSE_TYPES},
-            "label": {"type": "string"},
             "base_product_name": {"type": "string"},
             "base_product_short": {"type": "string"},
             "base_product_version": {"type": "string"},
@@ -699,11 +685,7 @@ def make_schema():
             "pkgset_allow_reuse": {"type": "boolean", "default": True},
             "createiso_allow_reuse": {"type": "boolean", "default": True},
             "extraiso_allow_reuse": {"type": "boolean", "default": True},
-            "pkgset_source": {"type": "string", "enum": [
+            "pkgset_source": {"type": "string", "enum": ["koji", "repos"]},
-                "koji",
-                "repos",
-                "kojimock",
-            ]},
             "createrepo_c": {"type": "boolean", "default": True},
             "createrepo_checksum": {
                 "type": "string",
@@ -736,6 +718,7 @@ def make_schema():
             ),
             "repoclosure_backend": {
                 "type": "string",
+                # Gather and repoclosure both have the same backends: yum + dnf
                 "default": _get_default_gather_backend(),
                 "enum": _get_gather_backends(),
             },
@@ -802,7 +785,7 @@ def make_schema():
                     _variant_arch_mapping({"type": "number", "enum": [1, 2, 3, 4]}),
                 ],
             },
-            "iso_hfs_ppc64le_compatible": {"type": "boolean", "default": False},
+            "iso_hfs_ppc64le_compatible": {"type": "boolean", "default": True},
             "multilib": _variant_arch_mapping(
                 {"$ref": "#/definitions/list_of_strings"}
             ),
@@ -831,14 +814,6 @@ def make_schema():
                 "type": "string",
                 "enum": ["lorax"],
             },
-            # In phase `buildinstall` we should add to compose only the
-            # images that will be used only as netinstall
-            "netinstall_variants": {
-                "$ref": "#/definitions/list_of_strings",
-                "default": [
-                    "BaseOS",
-                ],
-            },
             "buildinstall_topdir": {"type": "string"},
             "buildinstall_kickstart": {"$ref": "#/definitions/str_or_scm_dict"},
             "buildinstall_use_guestmount": {"type": "boolean", "default": True},
@@ -894,10 +869,7 @@ def make_schema():
             "paths_module": {"type": "string"},
             "skip_phases": {
                 "type": "array",
-                "items": {
+                "items": {"type": "string", "enum": PHASES_NAMES + ["productimg"]},
-                    "type": "string",
-                    "enum": PHASES_NAMES + ["productimg", "live_images"],
-                },
                 "default": [],
             },
             "image_name_format": {
@@ -931,6 +903,11 @@ 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"},
@@ -963,6 +940,8 @@ 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": []},
@@ -982,7 +961,20 @@ def make_schema():
                             "properties": {
                                 "include_variants": {"$ref": "#/definitions/strings"},
                                 "extra_files": _one_or_list(
-                                    {"$ref": "#/definitions/extra_file"}
+                                    {
+                                        "type": "object",
+                                        "properties": {
+                                            "scm": {"type": "string"},
+                                            "repo": {"type": "string"},
+                                            "branch": {
+                                                "$ref": "#/definitions/optional_string"
+                                            },
+                                            "file": {"$ref": "#/definitions/strings"},
+                                            "dir": {"$ref": "#/definitions/strings"},
+                                            "target": {"type": "string"},
+                                        },
+                                        "additionalProperties": False,
+                                    }
                                 ),
                                 "filename": {"type": "string"},
                                 "volid": {"$ref": "#/definitions/strings"},
@@ -1074,6 +1066,7 @@ def make_schema():
                                     "required": [
                                         "treefile",
                                         "config_url",
+                                        "repo",
                                         "ostree_repo",
                                     ],
                                     "additionalProperties": False,
@@ -1111,41 +1104,6 @@ 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",
-                                },
-                                "subvariant": {"type": "string"},
-                                "name": {"type": "string"},
-                            },
-                            "required": [
-                                "treefile",
-                                "config_url",
-                            ],
-                            "additionalProperties": False,
-                        }
-                    ),
-                },
-                "additionalProperties": False,
-            },
             "ostree_installer": _variant_arch_mapping(
                 {
                     "type": "object",
@@ -1170,9 +1128,11 @@ 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",
@@ -1223,57 +1183,6 @@ 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"},
-                                "version": {"type": "string"},
-                                "repo_releasever": {"type": "string"},
-                                "manifest_type": {"type": "string"},
-                                "use_buildroot_repo": {"type": "boolean"},
-                            },
-                            "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"},
-            "kiwibuild_version": {"type": "string"},
-            "kiwibuild_repo_releasever": {"type": "string"},
-            "kiwibuild_use_buildroot_repo": {"type": "boolean", "default": False},
             "osbuild_target": {"type": "string"},
             "osbuild_release": {"$ref": "#/definitions/optional_string"},
             "osbuild_version": {"type": "string"},
@@ -1335,10 +1244,6 @@ def make_schema():
                                 "ostree_ref": {"type": "string"},
                                 "ostree_parent": {"type": "string"},
                                 "manifest_type": {"type": "string"},
-                                "customizations": {
-                                    "type": "object",
-                                    "additionalProperties": True,
-                                },
                                 "upload_options": {
                                     # this should be really 'oneOf', but the minimal
                                     # required properties in AWSEC2 and GCP options
@@ -1428,58 +1333,6 @@ def make_schema():
                     },
                 },
             },
-            "imagebuilder": {
-                "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": {
-                                "name": {"type": "string"},
-                                "target": {"type": "string"},
-                                "arches": {"$ref": "#/definitions/list_of_strings"},
-                                "types": {"$ref": "#/definitions/list_of_strings"},
-                                "version": {"type": "string"},
-                                "repos": {"$ref": "#/definitions/list_of_strings"},
-                                "release": {"type": "string"},
-                                "distro": {"type": "string"},
-                                "scratch": {"type": "boolean"},
-                                "ostree": {
-                                    "type": "object",
-                                    "properties": {
-                                        "parent": {"type": "string"},
-                                        "ref": {"type": "string"},
-                                        "url": {"type": "string"},
-                                    },
-                                },
-                                "failable": {"$ref": "#/definitions/list_of_strings"},
-                                "subvariant": {"type": "string"},
-                                "blueprint": {
-                                    "type": "object",
-                                    "additionalProperties": True,
-                                },
-                                "seed": {"type": "integer"},
-                                "manifest_type": {"type": "string"},
-                            },
-                            "required": [
-                                "name",
-                                "types",
-                            ],
-                            "additionalProperties": False,
-                        },
-                    }
-                },
-                "additionalProperties": False,
-            },
-            "imagebuilder_target": {"type": "string"},
-            "imagebuilder_release": {"$ref": "#/definitions/optional_string"},
-            "imagebuilder_version": {"type": "string"},
-            "imagebuilder_seed": {"type": "integer"},
-            "imagebuilder_scratch": {"type": "boolean"},
             "lorax_options": _variant_arch_mapping(
                 {
                     "type": "object",
@@ -1499,7 +1352,6 @@ def make_schema():
                         "skip_branding": {"type": "boolean"},
                         "squashfs_only": {"type": "boolean"},
                         "configuration_file": {"$ref": "#/definitions/str_or_scm_dict"},
-                        "rootfs_type": {"type": "string"},
                     },
                     "additionalProperties": False,
                 }
@@ -1508,6 +1360,9 @@ 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"
             },
@@ -1559,7 +1414,21 @@ def make_schema():
                 "additionalProperties": False,
             },
             "extra_files": _variant_arch_mapping(
-                {"type": "array", "items": {"$ref": "#/definitions/extra_file"}}
+                {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "scm": {"type": "string"},
+                            "repo": {"type": "string"},
+                            "branch": {"$ref": "#/definitions/optional_string"},
+                            "file": {"$ref": "#/definitions/strings"},
+                            "dir": {"type": "string"},
+                            "target": {"type": "string"},
+                        },
+                        "additionalProperties": False,
+                    },
+                }
             ),
             "gather_lookaside_repos": _variant_arch_mapping(
                 {"$ref": "#/definitions/strings"}
@@ -1680,13 +1549,10 @@ def update_schema(schema, update_dict):
 
 
 def _get_gather_backends():
+    if six.PY2:
+        return ["yum", "dnf"]
     return ["dnf"]
 
 
 def _get_default_gather_backend():
-    return "dnf"
+    return "yum" if six.PY2 else "dnf"
-
-
-def _resolve_container_tag(instance, tag_resolver):
-    if instance.get("scm") == "container-image":
-        instance["repo"] = tag_resolver(instance["repo"])

pungi/compose.py

@@ -50,7 +50,6 @@ from pungi.util import (
     translate_path_raw,
 )
 from pungi.metadata import compose_to_composeinfo
-from pungi.otel import tracing
 
 try:
     # This is available since productmd >= 1.18
@@ -131,16 +130,15 @@ def cts_auth(pungi_conf):
             cts_oidc_client_id = os.environ.get(
                 "CTS_OIDC_CLIENT_ID", ""
             ) or pungi_conf.get("cts_oidc_client_id", "")
-            with tracing.span("obtain-oidc-token"):
+            token = retry_request(
-                token = retry_request(
+                "post",
-                    "post",
+                cts_oidc_token_url,
-                    cts_oidc_token_url,
+                data={
-                    data={
+                    "grant_type": "client_credentials",
-                        "grant_type": "client_credentials",
+                    "client_id": cts_oidc_client_id,
-                        "client_id": cts_oidc_client_id,
+                    "client_secret": os.environ.get("CTS_OIDC_CLIENT_SECRET", ""),
-                        "client_secret": os.environ.get("CTS_OIDC_CLIENT_SECRET", ""),
+                },
-                    },
+            ).json()["access_token"]
-                ).json()["access_token"]
             auth = BearerAuth(token)
             del token
 
@@ -196,9 +194,8 @@ def get_compose_info(
             "parent_compose_ids": parent_compose_ids,
             "respin_of": respin_of,
         }
-        with tracing.span("create-compose-in-cts"):
+        with cts_auth(conf) as authentication:
-            with cts_auth(conf) as authentication:
+            rv = retry_request("post", url, json_data=data, auth=authentication)
-                rv = retry_request("post", url, json_data=data, auth=authentication)
 
         # Update local ComposeInfo with received ComposeInfo.
         cts_ci = ComposeInfo()
@@ -234,9 +231,8 @@ def update_compose_url(compose_id, compose_dir, conf):
             "action": "set_url",
             "compose_url": compose_url,
         }
-        with tracing.span("update-compose-url"):
+        with cts_auth(conf) as authentication:
-            with cts_auth(conf) as authentication:
+            return retry_request("patch", url, json_data=data, auth=authentication)
-                return retry_request("patch", url, json_data=data, auth=authentication)
 
 
 def get_compose_dir(
@@ -377,7 +373,6 @@ class Compose(kobo.log.LoggingBase):
         self.ci_base.load(
             os.path.join(self.paths.work.topdir(arch="global"), "composeinfo-base.json")
         )
-        tracing.set_attribute("compose_id", self.compose_id)
 
         self.supported = supported
         if (
@@ -471,10 +466,13 @@ class Compose(kobo.log.LoggingBase):
 
     @property
     def should_create_yum_database(self):
-        """Explicit configuration trumps all. Yum is no longer supported, so
+        """Explicit configuration trumps all. Otherwise check gather backend
-        default to False.
+        and only create it for Yum.
         """
-        return self.conf.get("createrepo_database", False)
+        config = self.conf.get("createrepo_database")
+        if config is not None:
+            return config
+        return self.conf["gather_backend"] == "yum"
 
     def read_variants(self):
         # TODO: move to phases/init ?
@@ -562,7 +560,6 @@ class Compose(kobo.log.LoggingBase):
         old_status = self.get_status()
         if stat_msg == old_status:
             return
-        tracing.set_attribute("compose_status", stat_msg)
         if old_status == "FINISHED":
             msg = "Could not modify a FINISHED compose: %s" % self.topdir
             self.log_error(msg)
@@ -721,10 +718,8 @@ 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)
-        tback = kobo.tback.Traceback(show_locals=show_locals).get_traceback()
+        with open(tb_path, "wb") as f:
-        # Kobo 0.36.0 returns traceback as str, older versions return bytes
+            f.write(kobo.tback.Traceback(show_locals=show_locals).get_traceback())
-        with open(tb_path, "wb" if isinstance(tback, bytes) else "w") as f:
-            f.write(tback)
 
     def load_old_compose_config(self):
         """

pungi/config.py

@@ -0,0 +1,79 @@
+# -*- 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
+
+from ConfigParser import SafeConfigParser
+
+from .arch_utils import getBaseArch
+
+# In development, `here` will point to the bin/ directory with scripts.
+here = sys.path[0]
+MULTILIBCONF = (
+    os.path.join(os.path.dirname(__file__), "..", "share", "multilib")
+    if here != "/usr/bin"
+    else "/usr/share/pungi/multilib"
+)
+
+
+class Config(SafeConfigParser):
+    def __init__(self, pungirc=None):
+        SafeConfigParser.__init__(self)
+
+        self.add_section("pungi")
+        self.add_section("lorax")
+
+        self.set("pungi", "osdir", "os")
+        self.set("pungi", "sourcedir", "source")
+        self.set("pungi", "debugdir", "debug")
+        self.set("pungi", "isodir", "iso")
+        self.set("pungi", "multilibconf", MULTILIBCONF)
+        self.set(
+            "pungi", "relnotefilere", "LICENSE README-BURNING-ISOS-en_US.txt ^RPM-GPG"
+        )
+        self.set("pungi", "relnotedirre", "")
+        self.set(
+            "pungi", "relnotepkgs", "fedora-repos fedora-release fedora-release-notes"
+        )
+        self.set("pungi", "product_path", "Packages")
+        self.set("pungi", "cachedir", "/var/cache/pungi")
+        self.set("pungi", "compress_type", "xz")
+        self.set("pungi", "arch", getBaseArch())
+        self.set("pungi", "family", "Fedora")
+        self.set("pungi", "iso_basename", "Fedora")
+        self.set("pungi", "version", time.strftime("%Y%m%d", time.localtime()))
+        self.set("pungi", "variant", "")
+        self.set("pungi", "destdir", os.getcwd())
+        self.set("pungi", "workdirbase", "/work")
+        self.set("pungi", "bugurl", "https://bugzilla.redhat.com")
+        self.set("pungi", "cdsize", "695.0")
+        self.set("pungi", "debuginfo", "True")
+        self.set("pungi", "alldeps", "True")
+        self.set("pungi", "isfinal", "False")
+        self.set("pungi", "nohash", "False")
+        self.set("pungi", "full_archlist", "False")
+        self.set("pungi", "multilib", "")
+        self.set("pungi", "lookaside_repos", "")
+        self.set("pungi", "resolve_deps", "True")
+        self.set("pungi", "no_dvd", "False")
+        self.set("pungi", "nomacboot", "False")
+        self.set("pungi", "rootfs_size", "False")
+
+        # if missing, self.read() is a noop, else change 'defaults'
+        if pungirc:
+            self.read(os.path.expanduser(pungirc))

pungi/createiso.py

@@ -3,9 +3,10 @@
 from __future__ import print_function
 
 import os
-import shlex
+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
@@ -40,13 +41,13 @@ def quote(str):
     expanded.
     """
     if str.startswith("$TEMPLATE"):
-        return "$TEMPLATE%s" % shlex.quote(str.replace("$TEMPLATE", "", 1))
+        return "$TEMPLATE%s" % shlex_quote(str.replace("$TEMPLATE", "", 1))
-    return shlex.quote(str)
+    return shlex_quote(str)
 
 
 def emit(f, cmd):
     """Print line of shell code into the stream."""
-    if isinstance(cmd, str):
+    if isinstance(cmd, six.string_types):
         print(cmd, file=f)
     else:
         print(" ".join([quote(x) for x in cmd]), file=f)
@@ -158,11 +159,15 @@ def write_xorriso_commands(opts):
 
     script = os.path.join(opts.script_dir, "xorriso-%s.txt" % id(opts))
     with open(script, "w") as f:
-        for cmd in iso.xorriso_commands(
+        emit(f, "-indev %s" % opts.boot_iso)
-            opts.arch, opts.boot_iso, os.path.join(opts.output_dir, opts.iso_name)
+        emit(f, "-outdev %s" % os.path.join(opts.output_dir, opts.iso_name))
-        ):
+        emit(f, "-boot_image any replay")
-            emit(f, " ".join(cmd))
         emit(f, "-volid %s" % opts.volid)
+        # isoinfo -J uses the Joliet tree, and it's used by virt-install
+        emit(f, "-joliet on")
+        # Support long filenames in the Joliet trees. Repodata is particularly
+        # likely to run into this limit.
+        emit(f, "-compliance joliet_long_names")
 
         with open(opts.graft_points) as gp:
             for line in gp:
@@ -173,6 +178,10 @@ def write_xorriso_commands(opts):
                 emit(f, "%s %s %s" % (cmd, fs_path, iso_path))
                 emit(f, "-chmod 0%o %s" % (_get_perms(fs_path), iso_path))
 
+        if opts.arch == "ppc64le":
+            # This is needed for the image to be bootable.
+            emit(f, "-as mkisofs -U --")
+
         emit(f, "-chown_r 0 /")
         emit(f, "-chgrp_r 0 /")
         emit(f, "-end")

pungi/gather_dnf.py

@@ -35,18 +35,9 @@ from pungi.profiler import Profiler
 from pungi.util import DEBUG_PATTERNS
 
 
-def filter_dotarch(queue, pattern, **kwargs):
+def get_source_name(pkg):
-    """Filter queue for packages matching the pattern. If pattern matches the
+    # Workaround for rhbz#1418298
-    dotarch format of <name>.<arch>, it is processed as such. Otherwise it is
+    return pkg.sourcerpm.rsplit("-", 2)[0]
-    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):
@@ -384,7 +375,7 @@ class Gather(GatherBase):
                 # lookaside
                 if self.is_from_lookaside(i):
                     self._set_flag(i, PkgFlag.lookaside)
-                if i.source_name in self.opts.fulltree_excludes:
+                if i.sourcerpm.rsplit("-", 2)[0] in self.opts.fulltree_excludes:
                     self._set_flag(i, PkgFlag.fulltree_exclude)
 
     def _get_package_deps(self, pkg, debuginfo=False):
@@ -460,16 +451,12 @@ class Gather(GatherBase):
                         name__glob=pattern[:-4], reponame__neq=self.opts.lookaside_repos
                     )
                 elif pungi.util.pkg_is_debug(pattern):
-                    pkgs = filter_dotarch(
+                    pkgs = self.q_debug_packages.filter(
-                        self.q_debug_packages,
+                        name__glob=pattern, reponame__neq=self.opts.lookaside_repos
-                        pattern,
-                        reponame__neq=self.opts.lookaside_repos,
                     )
                 else:
-                    pkgs = filter_dotarch(
+                    pkgs = self.q_binary_packages.filter(
-                        self.q_binary_packages,
+                        name__glob=pattern, reponame__neq=self.opts.lookaside_repos
-                        pattern,
-                        reponame__neq=self.opts.lookaside_repos,
                     )
 
                 exclude.update(pkgs)
@@ -535,14 +522,25 @@ class Gather(GatherBase):
                                 name__glob=pattern[:-2]
                             ).apply()
                         else:
-                            pkgs = filter_dotarch(self.q_debug_packages, pattern)
+                            pkgs = self.q_debug_packages.filter(
+                                name__glob=pattern
+                            ).apply()
                     else:
                         if pattern.endswith(".+"):
                             pkgs = self.q_multilib_binary_packages.filter(
                                 name__glob=pattern[:-2]
                             ).apply()
                         else:
-                            pkgs = filter_dotarch(self.q_binary_packages, pattern)
+                            kwargs = {"name__glob": pattern}
+                            if "." in pattern:
+                                # The pattern could be name.arch. Check if the
+                                # arch is valid, and if yes, make a more
+                                # specific query.
+                                name, arch = pattern.split(".", 1)
+                                if arch in arch_utils.arches:
+                                    kwargs["name__glob"] = name
+                                    kwargs["arch__eq"] = arch
+                            pkgs = self.q_binary_packages.filter(**kwargs).apply()
 
                 if not pkgs:
                     self.logger.error(
@@ -834,12 +832,6 @@ class Gather(GatherBase):
                     continue
                 if self.is_from_lookaside(i):
                     self._set_flag(i, PkgFlag.lookaside)
-                srpm_name = i.source_name
-                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)
@@ -866,7 +858,7 @@ class Gather(GatherBase):
         for pkg in sorted(self.result_binary_packages):
             assert pkg is not None
 
-            if pkg.source_name in self.opts.fulltree_excludes:
+            if get_source_name(pkg) in self.opts.fulltree_excludes:
                 self.logger.debug("No fulltree for %s due to exclude list", pkg)
                 continue
 
@@ -1080,7 +1072,7 @@ class Gather(GatherBase):
                 if ex.errno == errno.EEXIST:
                     self.logger.warning("Downloaded package exists in %s", target)
                 else:
-                    self.logger.error("Unable to link %s from the dnf cache.", pkg.name)
+                    self.logger.error("Unable to link %s from the yum cache.", pkg.name)
                     raise
 
     def log_count(self, msg, method, *args):

pungi/linker.py

@@ -228,7 +228,20 @@ class Linker(kobo.log.LoggingBase):
             raise ValueError("Unknown link_type: %s" % link_type)
 
     def link(self, src, dst, link_type="hardlink-or-copy"):
-        if os.path.isdir(src):
+        """Link directories recursively."""
-            raise RuntimeError("Linking directories recursively is not supported")
+        if os.path.isfile(src) or os.path.islink(src):
+            self._link_file(src, dst, link_type)
+            return
 
-        self._link_file(src, dst, link_type)
+        if os.path.isfile(dst):
+            raise OSError(errno.EEXIST, "File exists")
+
+        if not self.test:
+            if not os.path.exists(dst):
+                makedirs(dst)
+            shutil.copystat(src, dst)
+
+        for i in os.listdir(src):
+            src_path = os.path.join(src, i)
+            dst_path = os.path.join(dst, i)
+            self.link(src_path, dst_path, link_type)

pungi/multilib_yum.py

@@ -0,0 +1,295 @@
+# -*- 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 re
+import fnmatch
+
+import pungi.pathmatch
+import pungi.gather
+import pungi.util
+
+
+LINE_PATTERN_RE = re.compile(r"^\s*(?P<line>[^#]+)(:?\s+(?P<comment>#.*))?$")
+RUNTIME_PATTERN_SPLIT_RE = re.compile(
+    r"^\s*(?P<path>[^\s]+)\s+(?P<pattern>[^\s]+)(:?\s+(?P<comment>#.*))?$"
+)
+SONAME_PATTERN_RE = re.compile(r"^(.+\.so\.[a-zA-Z0-9_\.]+).*$")
+
+
+def read_lines(lines):
+    result = []
+    for i in lines:
+        i = i.strip()
+
+        if not i:
+            continue
+
+        # skip comments
+        if i.startswith("#"):
+            continue
+
+        match = LINE_PATTERN_RE.match(i)
+        if match is None:
+            raise ValueError("Couldn't parse line: %s" % i)
+        gd = match.groupdict()
+        result.append(gd["line"])
+    return result
+
+
+def read_lines_from_file(path):
+    lines = open(path, "r").readlines()
+    lines = read_lines(lines)
+    return lines
+
+
+def read_runtime_patterns(lines):
+    result = []
+    for i in read_lines(lines):
+        match = RUNTIME_PATTERN_SPLIT_RE.match(i)
+        if match is None:
+            raise ValueError("Couldn't parse pattern: %s" % i)
+        gd = match.groupdict()
+        result.append((gd["path"], gd["pattern"]))
+    return result
+
+
+def read_runtime_patterns_from_file(path):
+    lines = open(path, "r").readlines()
+    return read_runtime_patterns(lines)
+
+
+def expand_runtime_patterns(patterns):
+    pm = pungi.pathmatch.PathMatch()
+    for path, pattern in patterns:
+        for root in ("", "/opt/*/*/root"):
+            # include Software Collections: /opt/<vendor>/<scl_name>/root/...
+            if "$LIBDIR" in path:
+                for lib_dir in ("/lib", "/lib64", "/usr/lib", "/usr/lib64"):
+                    path_pattern = path.replace("$LIBDIR", lib_dir)
+                    path_pattern = "%s/%s" % (root, path_pattern.lstrip("/"))
+                    pm[path_pattern] = (path_pattern, pattern)
+            else:
+                path_pattern = "%s/%s" % (root, path.lstrip("/"))
+                pm[path_pattern] = (path_pattern, pattern)
+    return pm
+
+
+class MultilibMethodBase(object):
+    """a base class for multilib methods"""
+
+    name = "base"
+
+    def __init__(self, config_path):
+        self.config_path = config_path
+
+    def select(self, po):
+        raise NotImplementedError
+
+    def skip(self, po):
+        if (
+            pungi.gather.is_noarch(po)
+            or pungi.gather.is_source(po)
+            or pungi.util.pkg_is_debug(po)
+        ):
+            return True
+        return False
+
+    def is_kernel(self, po):
+        for p_name, p_flag, (p_e, p_v, p_r) in po.provides:
+            if p_name == "kernel":
+                return True
+        return False
+
+    def is_kernel_devel(self, po):
+        for p_name, p_flag, (p_e, p_v, p_r) in po.provides:
+            if p_name == "kernel-devel":
+                return True
+        return False
+
+    def is_kernel_or_kernel_devel(self, po):
+        for p_name, p_flag, (p_e, p_v, p_r) in po.provides:
+            if p_name in ("kernel", "kernel-devel"):
+                return True
+        return False
+
+
+class NoneMultilibMethod(MultilibMethodBase):
+    """multilib disabled"""
+
+    name = "none"
+
+    def select(self, po):
+        return False
+
+
+class AllMultilibMethod(MultilibMethodBase):
+    """all packages are multilib"""
+
+    name = "all"
+
+    def select(self, po):
+        if self.skip(po):
+            return False
+        return True
+
+
+class RuntimeMultilibMethod(MultilibMethodBase):
+    """pre-defined paths to libs"""
+
+    name = "runtime"
+
+    def __init__(self, *args, **kwargs):
+        super(RuntimeMultilibMethod, self).__init__(*args, **kwargs)
+        self.blacklist = read_lines_from_file(
+            self.config_path + "runtime-blacklist.conf"
+        )
+        self.whitelist = read_lines_from_file(
+            self.config_path + "runtime-whitelist.conf"
+        )
+        self.patterns = expand_runtime_patterns(
+            read_runtime_patterns_from_file(self.config_path + "runtime-patterns.conf")
+        )
+
+    def select(self, po):
+        if self.skip(po):
+            return False
+        if po.name in self.blacklist:
+            return False
+        if po.name in self.whitelist:
+            return True
+        if self.is_kernel(po):
+            return False
+
+        # gather all *.so.* provides from the RPM header
+        provides = set()
+        for i in po.provides:
+            match = SONAME_PATTERN_RE.match(i[0])
+            if match is not None:
+                provides.add(match.group(1))
+
+        for path in po.returnFileEntries() + po.returnFileEntries("ghost"):
+            dirname, filename = path.rsplit("/", 1)
+            dirname = dirname.rstrip("/")
+
+            patterns = self.patterns[dirname]
+            if not patterns:
+                continue
+            for dir_pattern, file_pattern in patterns:
+                if file_pattern == "-":
+                    return True
+                if fnmatch.fnmatch(filename, file_pattern):
+                    if ".so.*" in file_pattern:
+                        if filename in provides:
+                            # return only if the lib is provided in RPM header
+                            # (some libs may be private, hence not exposed in Provides)
+                            return True
+                    else:
+                        return True
+        return False
+
+
+class KernelMultilibMethod(MultilibMethodBase):
+    """kernel and kernel-devel"""
+
+    name = "kernel"
+
+    def __init__(self, *args, **kwargs):
+        super(KernelMultilibMethod, self).__init__(*args, **kwargs)
+
+    def select(self, po):
+        if self.is_kernel_or_kernel_devel(po):
+            return True
+        return False
+
+
+class YabootMultilibMethod(MultilibMethodBase):
+    """yaboot on ppc"""
+
+    name = "yaboot"
+
+    def __init__(self, *args, **kwargs):
+        super(YabootMultilibMethod, self).__init__(*args, **kwargs)
+
+    def select(self, po):
+        if po.arch in ["ppc"]:
+            if po.name.startswith("yaboot"):
+                return True
+        return False
+
+
+class DevelMultilibMethod(MultilibMethodBase):
+    """all -devel and -static packages"""
+
+    name = "devel"
+
+    def __init__(self, *args, **kwargs):
+        super(DevelMultilibMethod, self).__init__(*args, **kwargs)
+        self.blacklist = read_lines_from_file(self.config_path + "devel-blacklist.conf")
+        self.whitelist = read_lines_from_file(self.config_path + "devel-whitelist.conf")
+
+    def select(self, po):
+        if self.skip(po):
+            return False
+        if po.name in self.blacklist:
+            return False
+        if po.name in self.whitelist:
+            return True
+        if self.is_kernel_devel(po):
+            return False
+        # HACK: exclude ghc*
+        if po.name.startswith("ghc-"):
+            return False
+        if po.name.endswith("-devel"):
+            return True
+        if po.name.endswith("-static"):
+            return True
+        for p_name, p_flag, (p_e, p_v, p_r) in po.provides:
+            if p_name.endswith("-devel"):
+                return True
+            if p_name.endswith("-static"):
+                return True
+        return False
+
+
+DEFAULT_METHODS = ["devel", "runtime"]
+METHOD_MAP = {}
+
+
+def init(config_path="/usr/share/pungi/multilib/"):
+    global METHOD_MAP
+
+    if not config_path.endswith("/"):
+        config_path += "/"
+
+    for cls in (
+        AllMultilibMethod,
+        DevelMultilibMethod,
+        KernelMultilibMethod,
+        NoneMultilibMethod,
+        RuntimeMultilibMethod,
+        YabootMultilibMethod,
+    ):
+        method = cls(config_path)
+        METHOD_MAP[method.name] = method
+
+
+def po_is_multilib(po, methods):
+    for method_name in methods:
+        if not method_name:
+            continue
+        method = METHOD_MAP[method_name]
+        if method.select(po):
+            return method_name
+    return None

pungi/notifier.py

@@ -104,8 +104,7 @@ class PungiNotifier(object):
             workdir=workdir,
             return_stdout=False,
             show_cmd=True,
-            text=True,
+            universal_newlines=True,
-            errors="replace",
             logfile=logfile,
         )
         if ret != 0:

pungi/ostree/__init__.py

@@ -19,7 +19,6 @@ import logging
 
 from .tree import Tree
 from .installer import Installer
-from .container import Container
 
 
 def main(args=None):
@@ -72,43 +71,6 @@ 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"
     )

pungi/ostree/container.py

@@ -1,85 +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 json
-import shlex
-
-
-from .base import OSTree
-from .utils import tweak_treeconf
-
-
-def emit(cmd):
-    """Print line of shell code into the stream."""
-    if isinstance(cmd, str):
-        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()

pungi/ostree/tree.py

@@ -64,8 +64,7 @@ class Tree(OSTree):
                 show_cmd=True,
                 stdout=True,
                 logfile=log_file,
-                text=True,
+                universal_newlines=True,
-                errors="replace",
             )
         finally:
             os.umask(oldumask)
@@ -78,8 +77,7 @@ class Tree(OSTree):
             show_cmd=True,
             stdout=True,
             logfile=log_file,
-            text=True,
+            universal_newlines=True,
-            errors="replace",
         )
 
     def _update_ref(self):

pungi/otel.py

@@ -1,229 +0,0 @@
-import itertools
-import os
-from contextlib import contextmanager
-
-"""
-This module contains two classes with the same interface. An instance of one of
-them is available as `tracing`. Which class is instantiated is selected
-depending on whether environment variables configuring OTel are configured.
-"""
-
-
-class DummyTracing:
-    """A dummy tracing module that doesn't actually do anything."""
-
-    def setup(self):
-        pass
-
-    @contextmanager
-    def span(self, *args, **kwargs):
-        yield
-
-    def set_attribute(self, name, value):
-        pass
-
-    def force_flush(self):
-        pass
-
-    def instrument_xmlrpc_proxy(self, proxy):
-        return proxy
-
-    def get_traceparent(self):
-        return None
-
-    def set_context(self, traceparent):
-        pass
-
-    def record_exception(self, exc, set_error_status=True):
-        pass
-
-
-class OtelTracing:
-    """This class implements the actual integration with opentelemetry."""
-
-    def setup(self):
-        """Configure opentelemetry tracing based on environment variables. This
-        setup is optional as it may not be desirable when pungi is used as a
-        library.
-        """
-        from opentelemetry import trace
-        from opentelemetry.sdk.resources import Resource
-        from opentelemetry.sdk.trace import TracerProvider
-        from opentelemetry.sdk.trace.export import (
-            BatchSpanProcessor,
-            ConsoleSpanExporter,
-        )
-        from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
-            OTLPSpanExporter,
-        )
-
-        otel_endpoint = os.environ["OTEL_EXPORTER_OTLP_ENDPOINT"]
-        provider = TracerProvider(
-            resource=Resource(attributes={"service.name": "pungi"})
-        )
-        if "console" == otel_endpoint:
-            # This is for debugging the tracing locally.
-            self.processor = BatchSpanProcessor(ConsoleSpanExporter())
-        else:
-            self.processor = BatchSpanProcessor(OTLPSpanExporter())
-        provider.add_span_processor(self.processor)
-        trace.set_tracer_provider(provider)
-
-        traceparent = os.environ.get("TRACEPARENT")
-        if traceparent:
-            self.set_context(traceparent)
-
-        try:
-            from opentelemetry.instrumentation.requests import RequestsInstrumentor
-
-            RequestsInstrumentor().instrument()
-        except ImportError:
-            pass
-
-    @property
-    def tracer(self):
-        from opentelemetry import trace
-
-        return trace.get_tracer(__name__)
-
-    @contextmanager
-    def span(self, name, **attributes):
-        """Create a new span as a child of the current one. Attributes can be
-        passed via kwargs."""
-        with self.tracer.start_as_current_span(name, attributes=attributes) as span:
-            yield span
-
-    def get_traceparent(self):
-        from opentelemetry.trace.propagation.tracecontext import (
-            TraceContextTextMapPropagator,
-        )
-
-        carrier = {}
-        TraceContextTextMapPropagator().inject(carrier)
-        return carrier["traceparent"]
-
-    def set_attribute(self, name, value):
-        """Set an attribute on the current span."""
-        from opentelemetry import trace
-
-        span = trace.get_current_span()
-        span.set_attribute(name, value)
-
-    def force_flush(self):
-        """Ensure all spans and traces are sent out. Call this before the
-        process exits."""
-        self.processor.force_flush()
-
-    def instrument_xmlrpc_proxy(self, proxy):
-        return InstrumentedClientSession(proxy)
-
-    def set_context(self, traceparent):
-        """Configure current context to match the given traceparent."""
-        from opentelemetry import context
-        from opentelemetry.trace.propagation.tracecontext import (
-            TraceContextTextMapPropagator,
-        )
-
-        ctx = TraceContextTextMapPropagator().extract(
-            carrier={"traceparent": traceparent}
-        )
-        context.attach(ctx)
-
-    def record_exception(self, exc, set_error_status=True):
-        """Records an exception for the current span and optionally marks the
-        span as failed."""
-        from opentelemetry import trace
-
-        span = trace.get_current_span()
-        span.record_exception(exc)
-
-        if set_error_status:
-            span.set_status(trace.status.StatusCode.ERROR)
-
-
-class InstrumentedClientSession:
-    """Wrapper around koji.ClientSession that creates spans for each API call.
-    RequestsInstrumentor can create spans at the HTTP requests level, but since
-    those all go the same XML-RPC endpoint, they are not very informative.
-
-    Multicall is not handled very well here. The spans will only have a
-    `multicall` boolean attribute, but they don't carry any additional data
-    that could group them.
-
-    Koji ClientSession supports three ways of making multicalls, but Pungi only
-    uses one, and that one is supported here.
-
-    Supported:
-
-        c.multicall = True
-        c.getBuild(1)
-        c.getBuild(2)
-        results = c.multiCall()
-
-    Not supported:
-
-        with c.multicall() as m:
-            r1 = m.getBuild(1)
-            r2 = m.getBuild(2)
-
-    Also not supported:
-
-        m = c.multicall()
-        r1 = m.getBuild(1)
-        r2 = m.getBuild(2)
-        m.call_all()
-
-    """
-
-    def __init__(self, session):
-        self.session = session
-
-    def _name(self, name):
-        """Helper for generating span names."""
-        return "%s.%s" % (self.session.__class__.__name__, name)
-
-    @property
-    def system(self):
-        """This is only ever used to get list of available API calls. It is
-        rather awkward though. Ideally we wouldn't really trace this at all,
-        but there's the underlying POST request to the hub, which is quite
-        confusing in the trace if there is no additional context."""
-        return self.session.system
-
-    @property
-    def multicall(self):
-        return self.session.multicall
-
-    @multicall.setter
-    def multicall(self, value):
-        self.session.multicall = value
-
-    def __getattr__(self, name):
-        return self._instrument_method(name, getattr(self.session, name))
-
-    def _instrument_method(self, name, callable):
-        def wrapper(*args, **kwargs):
-            with tracing.span(self._name(name)) as span:
-                span.set_attribute("arguments", _format_args(args, kwargs))
-                if self.session.multicall:
-                    tracing.set_attribute("multicall", True)
-                return callable(*args, **kwargs)
-
-        return wrapper
-
-
-def _format_args(args, kwargs):
-    """Turn args+kwargs into a single string. OTel could choke on more
-    complicated data."""
-    return ", ".join(
-        itertools.chain(
-            (repr(arg) for arg in args),
-            (f"{key}={value!r}" for key, value in kwargs.items()),
-        )
-    )
-
-
-if "OTEL_EXPORTER_OTLP_ENDPOINT" in os.environ:
-    tracing = OtelTracing()
-else:
-    tracing = DummyTracing()

pungi/pathmatch.py

@@ -0,0 +1,73 @@
+# -*- 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 fnmatch
+
+
+def head_tail_split(name):
+    name_split = name.strip("/").split("/", 1)
+    if len(name_split) == 2:
+        head = name_split[0]
+        tail = name_split[1].strip("/")
+    else:
+        head, tail = name_split[0], None
+    return head, tail
+
+
+class PathMatch(object):
+    def __init__(self, parent=None, desc=None):
+        self._patterns = {}
+        self._final_patterns = {}
+        self._values = []
+
+    def __setitem__(self, name, value):
+        head, tail = head_tail_split(name)
+
+        if tail is not None:
+            # recursion
+            if head not in self._patterns:
+                self._patterns[head] = PathMatch(parent=self, desc=head)
+            self._patterns[head][tail] = value
+        else:
+            if head not in self._final_patterns:
+                self._final_patterns[head] = PathMatch(parent=self, desc=head)
+            if value not in self._final_patterns[head]._values:
+                self._final_patterns[head]._values.append(value)
+
+    def __getitem__(self, name):
+        result = []
+        head, tail = head_tail_split(name)
+        for pattern in self._patterns:
+            if fnmatch.fnmatch(head, pattern):
+                if tail is None:
+                    values = self._patterns[pattern]._values
+                else:
+                    values = self._patterns[pattern][tail]
+                for value in values:
+                    if value not in result:
+                        result.append(value)
+
+        for pattern in self._final_patterns:
+            if tail is None:
+                x = head
+            else:
+                x = "%s/%s" % (head, tail)
+            if fnmatch.fnmatch(x, pattern):
+                values = self._final_patterns[pattern]._values
+                for value in values:
+                    if value not in result:
+                        result.append(value)
+        return result

pungi/phases/__init__.py

@@ -25,18 +25,16 @@ 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 .imagebuilder import ImageBuilderPhase  # noqa
 from .repoclosure import RepoclosurePhase  # noqa
 from .test import TestPhase  # noqa
 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
 

pungi/phases/buildinstall.py

@@ -16,30 +16,29 @@
 
 import errno
 import os
-import pickle
 import time
-import shlex
 import shutil
 import re
+from six.moves import cPickle as pickle
 from copy import copy
 
-from kobo.threads import ThreadPool
+from kobo.threads import ThreadPool, WorkerThread
 from kobo.shortcuts import run, force_list
 import kobo.rpmlib
 from productmd.images import Image
+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
+from pungi.util import copy_all, translate_path, move_all
 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, download_and_extract_archive
+from pungi.runroot import Runroot
-from pungi.threading import TelemetryWorkerThread as WorkerThread
 
 
 class BuildinstallPhase(PhaseBase):
@@ -95,7 +94,6 @@ class BuildinstallPhase(PhaseBase):
         squashfs_only = False
         configuration_file = None
         configuration_file_source = None
-        rootfs_type = None
         version = self.compose.conf.get(
             "treeinfo_version", self.compose.conf["release_version"]
         )
@@ -118,7 +116,6 @@ class BuildinstallPhase(PhaseBase):
             skip_branding = data.get("skip_branding", False)
             configuration_file_source = data.get("configuration_file")
             squashfs_only = data.get("squashfs_only", False)
-            rootfs_type = data.get("rootfs_type", None)
             if "version" in data:
                 version = data["version"]
         output_dir = os.path.join(output_dir, variant.uid)
@@ -147,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 or self.lorax_use_koji_plugin:
+            if final_output_dir != output_dir:
                 comps_repo = translate_path(self.compose, comps_repo)
             repos.append(comps_repo)
 
@@ -172,9 +169,9 @@ 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,
-                "rootfs-type": rootfs_type,
             }
         else:
             # If the buildinstall_topdir is set, it means Koji is used for
@@ -209,11 +206,10 @@ class BuildinstallPhase(PhaseBase):
                 skip_branding=skip_branding,
                 squashfs_only=squashfs_only,
                 configuration_file=configuration_file,
-                rootfs_type=rootfs_type,
             )
             return "rm -rf %s && %s" % (
-                shlex.quote(output_topdir),
+                shlex_quote(output_topdir),
-                " ".join([shlex.quote(x) for x in lorax_cmd]),
+                " ".join([shlex_quote(x) for x in lorax_cmd]),
             )
 
     def get_repos(self, arch):
@@ -239,7 +235,7 @@ class BuildinstallPhase(PhaseBase):
             )
             makedirs(final_output_dir)
             repo_baseurls = self.get_repos(arch)
-            if final_output_dir != output_dir or self.lorax_use_koji_plugin:
+            if final_output_dir != output_dir:
                 repo_baseurls = [translate_path(self.compose, r) for r in repo_baseurls]
 
             if self.buildinstall_method == "lorax":
@@ -418,8 +414,8 @@ def tweak_buildinstall(
     # copy src to temp
     # TODO: place temp on the same device as buildinstall dir so we can hardlink
     cmd = "cp -dRv --preserve=mode,links,timestamps --remove-destination %s/* %s/" % (
-        shlex.quote(src),
+        shlex_quote(src),
-        shlex.quote(tmp_dir),
+        shlex_quote(tmp_dir),
     )
     run(cmd)
 
@@ -457,12 +453,12 @@ def tweak_buildinstall(
                         run(cmd)
 
     # HACK: make buildinstall files world readable
-    run("chmod -R a+rX %s" % shlex.quote(tmp_dir))
+    run("chmod -R a+rX %s" % shlex_quote(tmp_dir))
 
     # copy temp to dst
     cmd = "cp -dRv --preserve=mode,links,timestamps --remove-destination %s/* %s/" % (
-        shlex.quote(tmp_dir),
+        shlex_quote(tmp_dir),
-        shlex.quote(dst),
+        shlex_quote(dst),
     )
     run(cmd)
 
@@ -526,20 +522,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(
+        img.volume_id = iso.get_volume_id(new_boot_iso_path)
-            new_boot_iso_path,
-            compose.conf.get("createiso_use_xorrisofs"),
-        )
     except RuntimeError:
         pass
-    # In this phase we should add to compose only the images that
+    compose.im.add(variant.uid, arch, img)
-    # will be used only as netinstall.
-    # On this step lorax generates environment
-    # for creating isos and create them.
-    # On step `extra_isos` we overwrite the not needed iso `boot Minimal` by
-    # new iso. It already contains necessary packages from incldued variants.
-    if variant.uid in compose.conf['netinstall_variants']:
-        compose.im.add(variant.uid, arch, img)
     compose.log_info("[DONE ] %s" % msg)
 
 
@@ -724,8 +710,8 @@ class BuildinstallThread(WorkerThread):
         # input on RPM level.
         cmd_copy = copy(cmd)
         for key in ["outputdir", "sources"]:
-            cmd_copy.pop(key, None)
+            del cmd_copy[key]
-            old_metadata["cmd"].pop(key, None)
+            del old_metadata["cmd"][key]
 
         # Do not reuse if command line arguments are not the same.
         if old_metadata["cmd"] != cmd_copy:
@@ -840,13 +826,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:
-            task_id = runroot.run_pungi_buildinstall(
+            runroot.run_pungi_buildinstall(
                 cmd,
                 log_file=log_file,
                 arch=arch,
                 packages=packages,
+                mounts=[compose.topdir],
                 weight=compose.conf["runroot_weights"].get("buildinstall"),
             )
         else:
@@ -879,17 +865,19 @@ 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
+            # If Koji pungi-buildinstall is used, then the buildinstall results are
-            # are attached as outputs to the Koji task. Download and unpack
+            # not stored directly in `output_dir` dir, but in "results" and "logs"
-            # them to the correct location.
+            # subdirectories. We need to move them to final_output_dir.
-            download_and_extract_archive(
+            results_dir = os.path.join(output_dir, "results")
-                compose, task_id, "results.tar.gz", final_output_dir
+            move_all(results_dir, final_output_dir, rm_src_dir=True)
-            )
 
-            # Download the logs into proper location too.
+            # Get the log_dir into which we should copy the resulting log files.
             log_fname = "buildinstall-%s-logs/dummy" % variant.uid
             final_log_dir = os.path.dirname(compose.paths.log.log_file(arch, log_fname))
-            download_and_extract_archive(compose, task_id, "logs.tar.gz", final_log_dir)
+            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)
 
         rpms = runroot.get_buildroot_rpms()
         self._write_buildinstall_metadata(

pungi/phases/createiso.py

@@ -14,18 +14,17 @@
 # along with this program; if not, see <https://gnu.org/licenses/>.
 
 
-import itertools
 import os
 import random
-import shlex
 import shutil
 import stat
 import json
 
 import productmd.treeinfo
 from productmd.images import Image
-from kobo.threads import ThreadPool
+from kobo.threads import ThreadPool, WorkerThread
-from kobo.shortcuts import run, relative_path, compute_file_checksums
+from kobo.shortcuts import run, relative_path
+from six.moves import shlex_quote
 
 from pungi.wrappers import iso
 from pungi.wrappers.createrepo import CreaterepoWrapper
@@ -43,7 +42,6 @@ from pungi.util import (
 from pungi.media_split import MediaSplitter, convert_media_size
 from pungi.compose_metadata.discinfo import read_discinfo, write_discinfo
 from pungi.runroot import Runroot
-from pungi.threading import TelemetryWorkerThread as WorkerThread
 
 from .. import createiso
 
@@ -190,14 +188,6 @@ 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))
@@ -467,14 +457,7 @@ class CreateIsoThread(WorkerThread):
 
         try:
             run_createiso_command(
-                num,
+                num, compose, bootable, arch, cmd["cmd"], mounts, log_file
-                compose,
-                bootable,
-                arch,
-                cmd["cmd"],
-                mounts,
-                log_file,
-                cmd["iso_path"],
             )
         except Exception:
             self.fail(compose, cmd, variant, arch)
@@ -541,10 +524,7 @@ 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(
+        img.volume_id = iso.get_volume_id(iso_path)
-            iso_path,
-            compose.conf.get("createiso_use_xorrisofs"),
-        )
     except RuntimeError:
         pass
     if arch == "src":
@@ -555,9 +535,7 @@ def add_iso_to_metadata(
     return img
 
 
-def run_createiso_command(
+def run_createiso_command(num, compose, bootable, arch, cmd, mounts, log_file):
-    num, compose, bootable, arch, cmd, mounts, log_file, iso_path
-):
     packages = [
         "coreutils",
         "xorriso" if compose.conf.get("createiso_use_xorrisofs") else "genisoimage",
@@ -599,76 +577,6 @@ def run_createiso_command(
         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):
     """
@@ -783,7 +691,7 @@ def prepare_iso(
 
         if file_list_content:
             # write modified repodata only if there are packages available
-            run("cp -a %s/repodata %s/" % (shlex.quote(tree_dir), shlex.quote(iso_dir)))
+            run("cp -a %s/repodata %s/" % (shlex_quote(tree_dir), shlex_quote(iso_dir)))
             with open(file_list, "w") as f:
                 f.write("\n".join(file_list_content))
             cmd = repo.get_createrepo_cmd(

pungi/phases/createrepo.py

@@ -27,7 +27,7 @@ import xml.dom.minidom
 import productmd.modules
 import productmd.rpms
 from kobo.shortcuts import relative_path, run
-from kobo.threads import ThreadPool
+from kobo.threads import ThreadPool, WorkerThread
 
 from ..module_util import Modulemd, collect_module_defaults, collect_module_obsoletes
 from ..util import (
@@ -38,7 +38,6 @@ from ..util import (
 from ..wrappers.createrepo import CreaterepoWrapper
 from ..wrappers.scm import get_dir_from_scm
 from .base import PhaseBase
-from ..threading import TelemetryWorkerThread as WorkerThread
 
 CACHE_TOPDIR = "/var/cache/pungi/createrepo_c/"
 createrepo_lock = threading.Lock()

pungi/phases/extra_files.py

@@ -112,7 +112,7 @@ def copy_extra_files(
         target_path = os.path.join(
             extra_files_dir, scm_dict.get("target", "").lstrip("/")
         )
-        getter(scm_dict, target_path, compose=compose, arch=arch)
+        getter(scm_dict, target_path, compose=compose)
 
     if os.listdir(extra_files_dir):
         metadata.populate_extra_files_metadata(

pungi/phases/extra_isos.py

@@ -18,8 +18,7 @@ import hashlib
 import json
 
 from kobo.shortcuts import force_list
-from kobo.threads import ThreadPool
+from kobo.threads import ThreadPool, WorkerThread
-from pungi.threading import TelemetryWorkerThread as WorkerThread
 import productmd.treeinfo
 from productmd.extra_files import ExtraFiles
 
@@ -167,7 +166,6 @@ 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(
@@ -206,14 +204,6 @@ 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))
@@ -343,24 +333,23 @@ def get_extra_files(compose, variant, arch, extra_files):
     included in the ISO.
     """
     extra_files_dir = compose.paths.work.extra_iso_extra_files_dir(arch, variant)
+    filelist = []
     for scm_dict in extra_files:
         getter = get_file_from_scm if "file" in scm_dict else get_dir_from_scm
         target = scm_dict.get("target", "").lstrip("/")
         target_path = os.path.join(extra_files_dir, target).rstrip("/")
-        getter(scm_dict, target_path, compose=compose, arch=arch)
+        filelist.extend(
+            os.path.join(target, f)
+            for f in getter(scm_dict, target_path, compose=compose)
+        )
 
-    filelist = [
-        os.path.relpath(os.path.join(root, f), extra_files_dir)
-        for root, _, files in os.walk(extra_files_dir)
-        for f in files
-    ]
     if filelist:
         metadata.populate_extra_files_metadata(
             ExtraFiles(),
             variant,
             arch,
             extra_files_dir,
-            sorted(filelist),
+            filelist,
             compose.conf["media_checksums"],
         )
 
@@ -431,12 +420,6 @@ def get_iso_contents(
         original_treeinfo,
         os.path.join(extra_files_dir, ".treeinfo"),
     )
-    tweak_repo_treeinfo(
-        compose,
-        include_variants,
-        original_treeinfo,
-        original_treeinfo,
-    )
 
     # Add extra files specific for the ISO
     files.update(
@@ -448,45 +431,6 @@ def get_iso_contents(
     return gp
 
 
-def tweak_repo_treeinfo(compose, include_variants, source_file, dest_file):
-    """
-    The method includes the variants to file .treeinfo of a variant. It takes
-    the variants which are described
-    by options `extra_isos -> include_variants`.
-    """
-    ti = productmd.treeinfo.TreeInfo()
-    ti.load(source_file)
-    main_variant = next(iter(ti.variants))
-    for variant_uid in include_variants:
-        variant = compose.all_variants[variant_uid]
-        var = productmd.treeinfo.Variant(ti)
-        var.id = variant.id
-        var.uid = variant.uid
-        var.name = variant.name
-        var.type = variant.type
-        ti.variants.add(var)
-
-    for variant_id in ti.variants:
-        var = ti.variants[variant_id]
-        if variant_id == main_variant:
-            var.paths.packages = 'Packages'
-            var.paths.repository = '.'
-        else:
-            var.paths.packages = os.path.join(
-                '../../..',
-                var.uid,
-                var.arch,
-                'os/Packages',
-            )
-            var.paths.repository = os.path.join(
-                '../../..',
-                var.uid,
-                var.arch,
-                'os',
-            )
-    ti.dump(dest_file, main_variant=main_variant)
-
-
 def tweak_treeinfo(compose, include_variants, source_file, dest_file):
     ti = load_and_tweak_treeinfo(source_file)
     for variant_uid in include_variants:
@@ -502,6 +446,7 @@ def tweak_treeinfo(compose, include_variants, source_file, dest_file):
         var = ti.variants[variant_id]
         var.paths.packages = os.path.join(var.uid, "Packages")
         var.paths.repository = var.uid
+
     ti.dump(dest_file)
 
 

pungi/phases/gather/__init__.py

@@ -17,14 +17,13 @@
 import glob
 import json
 import os
-import pickle
 import shutil
 import threading
 
 from kobo.rpmlib import parse_nvra
 from kobo.shortcuts import run
 from productmd.rpms import Rpms
-from pungi.phases.pkgset.common import get_all_arches
+from six.moves import cPickle as pickle
 
 try:
     from queue import Queue
@@ -650,11 +649,6 @@ def _make_lookaside_repo(compose, variant, arch, pkg_map, package_sets=None):
             pungi.wrappers.kojiwrapper.KojiWrapper(compose).koji_module.config.topdir,
         ).rstrip("/")
         + "/",
-        "kojimock": lambda: pungi.wrappers.kojiwrapper.KojiMockWrapper(
-            compose,
-            get_all_arches(compose),
-        ).koji_module.config.topdir.rstrip("/")
-        + "/",
     }
     path_prefix = prefixes[compose.conf["pkgset_source"]]()
     package_list = set()
@@ -666,11 +660,6 @@ 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) :]

pungi/phases/gather/link.py

@@ -87,7 +87,7 @@ def link_files(compose, arch, variant, pkg_map, pkg_sets, manifest, srpm_map={})
         dst_relpath = os.path.join(packages_dir_relpath, package_path)
 
         # link file
-        pool.queue_put((os.path.realpath(pkg["path"]), dst))
+        pool.queue_put((pkg["path"], dst))
 
         # update rpm manifest
         pkg_obj = pkg_by_path[pkg["path"]]
@@ -116,7 +116,7 @@ def link_files(compose, arch, variant, pkg_map, pkg_sets, manifest, srpm_map={})
         dst_relpath = os.path.join(packages_dir_relpath, package_path)
 
         # link file
-        pool.queue_put((os.path.realpath(pkg["path"]), dst))
+        pool.queue_put((pkg["path"], dst))
 
         # update rpm manifest
         pkg_obj = pkg_by_path[pkg["path"]]
@@ -146,7 +146,7 @@ def link_files(compose, arch, variant, pkg_map, pkg_sets, manifest, srpm_map={})
         dst_relpath = os.path.join(packages_dir_relpath, package_path)
 
         # link file
-        pool.queue_put((os.path.realpath(pkg["path"]), dst))
+        pool.queue_put((pkg["path"], dst))
 
         # update rpm manifest
         pkg_obj = pkg_by_path[pkg["path"]]

pungi/phases/gather/methods/method_deps.py

@@ -15,6 +15,7 @@
 
 
 import os
+import shutil
 
 from kobo.shortcuts import run
 from kobo.pkgset import SimpleRpmWrapper, RpmWrapper
@@ -219,7 +220,9 @@ def resolve_deps(compose, arch, variant, source_name=None):
     yum_arch = tree_arch_to_yum_arch(arch)
     tmp_dir = compose.paths.work.tmp_dir(arch, variant)
     cache_dir = compose.paths.work.pungi_cache_dir(arch, variant)
+    # TODO: remove YUM code, fully migrate to DNF
     backends = {
+        "yum": pungi_wrapper.get_pungi_cmd,
         "dnf": pungi_wrapper.get_pungi_cmd_dnf,
     }
     get_cmd = backends[compose.conf["gather_backend"]]
@@ -242,6 +245,17 @@ def resolve_deps(compose, arch, variant, source_name=None):
     with temp_dir(prefix="pungi_") as work_dir:
         run(cmd, logfile=pungi_log, show_cmd=True, workdir=work_dir, env=os.environ)
 
+    # Clean up tmp dir
+    # Workaround for rpm not honoring sgid bit which only appears when yum is used.
+    yumroot_dir = os.path.join(tmp_dir, "work", arch, "yumroot")
+    if os.path.isdir(yumroot_dir):
+        try:
+            shutil.rmtree(yumroot_dir)
+        except Exception as e:
+            compose.log_warning(
+                "Failed to clean up tmp dir: %s %s" % (yumroot_dir, str(e))
+            )
+
     with open(pungi_log, "r") as f:
         packages, broken_deps, missing_comps_pkgs = pungi_wrapper.parse_log(f)
 

pungi/phases/gather/methods/method_nodeps.py

@@ -16,6 +16,7 @@
 import os
 from pprint import pformat
 import re
+import six
 
 import pungi.arch
 from pungi.util import pkg_is_rpm, pkg_is_srpm, pkg_is_debug
@@ -73,7 +74,7 @@ class GatherMethodNodeps(pungi.phases.gather.method.GatherMethodBase):
             if not pkg_is_rpm(pkg):
                 continue
             for gathered_pkg, pkg_arch in packages:
-                if isinstance(gathered_pkg, str) and not re.match(
+                if isinstance(gathered_pkg, six.string_types) and not re.match(
                     gathered_pkg.replace(".", "\\.")
                     .replace("+", "\\+")
                     .replace("*", ".*")

pungi/phases/image_build.py

@@ -13,8 +13,7 @@ from pungi.util import as_local_file, translate_path, get_repo_urls, version_gen
 from pungi.phases import base
 from pungi.linker import Linker
 from pungi.wrappers.kojiwrapper import KojiWrapper
-from kobo.threads import ThreadPool
+from kobo.threads import ThreadPool, WorkerThread
-from pungi.threading import TelemetryWorkerThread as WorkerThread
 from kobo.shortcuts import force_list
 from productmd.images import Image
 from productmd.rpms import Rpms
@@ -23,13 +22,10 @@ from productmd.rpms import Rpms
 # This is a mapping from formats to file extensions. The format is what koji
 # image-build command expects as argument, and the extension is what the file
 # name will be ending with. The extensions are used to filter out which task
-# results will be pulled into the compose. This dict is also used later in
+# results will be pulled into the compose.
-# the process to set the image 'type' in productmd metadata terms - the type
-# is set as the first key in this dict which has the file's extension in its
-# values. This dict is imported and extended for similar purposes by other
-# phases (at least osbuild and kiwibuild).
 EXTENSIONS = {
-    "docker": ["tar.xz"],
+    "docker": ["tar.gz", "tar.xz"],
+    "iso": ["iso"],
     "liveimg-squashfs": ["liveimg.squashfs"],
     "qcow": ["qcow"],
     "qcow2": ["qcow2"],
@@ -44,6 +40,7 @@ EXTENSIONS = {
     "vdi": ["vdi"],
     "vmdk": ["vmdk"],
     "vpc": ["vhd"],
+    "vhd-compressed": ["vhd.gz", "vhd.xz"],
     "vsphere-ova": ["vsphere.ova"],
 }
 

pungi/phases/image_container.py

@@ -2,13 +2,12 @@
 
 import os
 import re
-from kobo.threads import ThreadPool
+from kobo.threads import ThreadPool, WorkerThread
 
 from .base import ConfigGuardedPhase, PhaseLoggerMixin
 from .. import util
 from ..wrappers import kojiwrapper
 from ..phases.osbs import add_metadata
-from ..threading import TelemetryWorkerThread as WorkerThread
 
 
 class ImageContainerPhase(PhaseLoggerMixin, ConfigGuardedPhase):
@@ -77,7 +76,7 @@ class ImageContainerThread(WorkerThread):
         )
         if koji.watch_task(task_id, log_file) != 0:
             raise RuntimeError(
-                "ImageContainer task failed: %s. See %s for details"
+                "ImageContainer: task %s failed: see %s for details"
                 % (task_id, log_file)
             )
 

pungi/phases/imagebuilder.py

@@ -1,263 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-from kobo.threads import ThreadPool
-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
-from ..threading import TelemetryWorkerThread as WorkerThread
-
-
-IMAGEBUILDEREXTENSIONS = [
-    ("vagrant-libvirt", ["vagrant.libvirt.box"], "vagrant-libvirt.box"),
-    (
-        "vagrant-virtualbox",
-        ["vagrant.virtualbox.box"],
-        "vagrant-virtualbox.box",
-    ),
-    ("container", ["oci.tar.xz"], "tar.xz"),
-    ("wsl2", ["wsl"], "wsl"),
-    # .iso images can be of many types - boot, cd, dvd, live... -
-    # so 'boot' is just a default guess. 'iso' is not a valid
-    # productmd image type
-    ("boot", [".iso"], "iso"),
-]
-
-
-class ImageBuilderPhase(
-    base.PhaseLoggerMixin, base.ImageConfigMixin, base.ConfigGuardedPhase
-):
-    name = "imagebuilder"
-
-    def __init__(self, compose):
-        super(ImageBuilderPhase, 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 ImageBuilderPhase._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.
-                # imagebuilder_release or global_release in the config
-                generics = {
-                    "release": self.get_release(image_conf),
-                    "target": self.get_config(image_conf, "target"),
-                    "types": self.get_config(image_conf, "types"),
-                    "seed": self.get_config(image_conf, "seed"),
-                    "scratch": self.get_config(image_conf, "scratch"),
-                    "version": self.get_version(image_conf),
-                }
-
-                repo = self._get_repo(image_conf, variant)
-
-                failable_arches = image_conf.pop("failable", [])
-                if failable_arches == ["*"]:
-                    failable_arches = image_conf["arches"]
-
-                self.pool.add(RunImageBuilderThread(self.pool))
-                self.pool.queue_put(
-                    (
-                        self.compose,
-                        variant,
-                        image_conf,
-                        build_arches,
-                        generics,
-                        repo,
-                        failable_arches,
-                    )
-                )
-
-        self.pool.start()
-
-
-class RunImageBuilderThread(WorkerThread):
-    def process(self, item, num):
-        (compose, variant, config, arches, generics, repo, failable_arches) = item
-        self.failable_arches = []
-        # the Koji task as a whole can only fail if *all* arches are failable
-        can_task_fail = set(self.failable_arches).issuperset(set(arches))
-        self.num = num
-        with util.failable(
-            compose,
-            can_task_fail,
-            variant,
-            "*",
-            "imageBuilderBuild",
-            logger=self.pool._logger,
-        ):
-            self.worker(compose, variant, config, arches, generics, repo)
-
-    def worker(self, compose, variant, config, arches, generics, repo):
-        msg = "imageBuilderBuild task for variant %s" % variant.uid
-        self.pool.log_info("[BEGIN] %s" % msg)
-        koji = kojiwrapper.KojiWrapper(compose)
-        koji.login()
-
-        opts = {}
-        opts["repos"] = repo
-
-        if generics.get("release"):
-            opts["release"] = generics["release"]
-
-        if generics.get("seed"):
-            opts["seed"] = generics["seed"]
-
-        if generics.get("scratch"):
-            opts["scratch"] = generics["scratch"]
-
-        if config.get("ostree"):
-            opts["ostree"] = config["ostree"]
-
-        if config.get("blueprint"):
-            opts["blueprint"] = config["blueprint"]
-
-        task_id = koji.koji_proxy.imageBuilderBuild(
-            generics["target"],
-            arches,
-            types=generics["types"],
-            name=config["name"],
-            version=generics["version"],
-            opts=opts,
-        )
-
-        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(), "imageBuilderBuild")
-        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(
-                "imageBuilderBuild 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.
-                if format_ == "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)
-
-                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)
-
-                # If user configured exact type, use it, otherwise try to
-                # figure it out based on the koji output.
-                img.type = config.get("manifest_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 = format_ == "iso"
-                img.subvariant = config.get("subvariant", variant.uid)
-                setattr(img, "can_fail", arch in self.failable_arches)
-                setattr(img, "deliverable", "imageBuilderBuild")
-                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):
-    # these are our image-builder-exclusive mappings for images whose extensions
-    # aren't quite the same as imagefactory. they come first as we
-    # want our oci.tar.xz mapping to win over the tar.xz one in
-    # EXTENSIONS
-    for type_, suffixes, format_ in IMAGEBUILDEREXTENSIONS:
-        if any(path.endswith(suffix) for suffix in suffixes):
-            return type_, format_
-    for type_, suffixes in EXTENSIONS.items():
-        for suffix in suffixes:
-            if path.endswith(suffix):
-                return type_, suffix
-    return None, None

pungi/phases/kiwibuild.py

@@ -1,263 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-from kobo.threads import ThreadPool
-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
-from ..threading import TelemetryWorkerThread as WorkerThread
-
-KIWIEXTENSIONS = [
-    ("vhd-compressed", ["vhdfixed.xz"], "vhd.xz"),
-    ("vagrant-libvirt", ["vagrant.libvirt.box"], "vagrant-libvirt.box"),
-    ("vagrant-virtualbox", ["vagrant.virtualbox.box"], "vagrant-virtualbox.box"),
-    # .iso images can be of many types - boot, cd, dvd, live... -
-    # so 'boot' is just a default guess. 'iso' is not a valid
-    # productmd image type
-    ("boot", [".iso"], "iso"),
-    ("fex", ["erofs.xz"], "erofs.xz"),
-    ("fex", ["erofs.gz"], "erofs.gz"),
-    ("fex", ["erofs"], "erofs"),
-    ("fex", ["squashfs.xz"], "squashfs.xz"),
-    ("fex", ["squashfs.gz"], "squashfs.gz"),
-    ("fex", ["squashfs"], "squashfs"),
-    ("container", ["oci.tar.xz"], "tar.xz"),
-    ("wsl2", ["wsl"], "wsl"),
-]
-
-
-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"
-                    ),
-                    "version": self.get_version(image_conf),
-                    "repo_releasever": self.get_config(image_conf, "repo_releasever"),
-                    "use_buildroot_repo": self.get_config(
-                        image_conf, "use_buildroot_repo"
-                    ),
-                }
-
-                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,
-            version=generics["version"],
-            repo_releasever=generics["repo_releasever"],
-            use_buildroot_repo=generics["use_buildroot_repo"],
-        )
-
-        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.
-                if format_ == "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)
-
-                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)
-
-                # If user configured exact type, use it, otherwise try to
-                # figure it out based on the koji output.
-                img.type = config.get("manifest_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
-                # Kiwi produces only bootable ISOs. Other kinds of images are
-                img.bootable = format_ == "iso"
-                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):
-    # these are our kiwi-exclusive mappings for images whose extensions
-    # aren't quite the same as imagefactory. they come first as we
-    # want our oci.tar.xz mapping to win over the tar.xz one in
-    # EXTENSIONS
-    for type_, suffixes, format_ in KIWIEXTENSIONS:
-        if any(path.endswith(suffix) for suffix in suffixes):
-            return type_, format_
-    for type_, suffixes in EXTENSIONS.items():
-        for suffix in suffixes:
-            if path.endswith(suffix):
-                return type_, suffix
-    return None, None

pungi/phases/live_images.py

@@ -0,0 +1,406 @@
+# -*- 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 = compose.koji_downloader.get_file(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)

pungi/phases/livemedia_phase.py

@@ -9,9 +9,8 @@ from pungi.util import translate_path, get_repo_urls
 from pungi.phases.base import ConfigGuardedPhase, ImageConfigMixin, PhaseLoggerMixin
 from pungi.linker import Linker
 from pungi.wrappers.kojiwrapper import KojiWrapper
-from kobo.threads import ThreadPool
+from kobo.threads import ThreadPool, WorkerThread
 from productmd.images import Image
-from pungi.threading import TelemetryWorkerThread as WorkerThread
 
 
 class LiveMediaPhase(PhaseLoggerMixin, ImageConfigMixin, ConfigGuardedPhase):

pungi/phases/osbs.py

@@ -1,19 +1,18 @@
 # -*- coding: utf-8 -*-
 
-import configparser
 import copy
 import fnmatch
 import json
 import os
-from kobo.threads import ThreadPool
+from kobo.threads import ThreadPool, WorkerThread
 from kobo import shortcuts
 from productmd.rpms import Rpms
+from six.moves import configparser
 
 from .base import ConfigGuardedPhase, PhaseLoggerMixin
 from .. import util
 from ..wrappers import kojiwrapper
 from ..wrappers.scm import get_file_from_scm
-from ..threading import TelemetryWorkerThread as WorkerThread
 
 
 class OSBSPhase(PhaseLoggerMixin, ConfigGuardedPhase):
@@ -135,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 failed: %s. See %s for details" % (task_id, log_file)
+                "OSBS: task %s failed: see %s for details" % (task_id, log_file)
             )
 
         scratch = config.get("scratch", False)
@@ -155,7 +154,7 @@ class OSBSThread(WorkerThread):
             reuse_file,
         )
 
-        self.pool.log_info("[DONE ] %s (task id: %s)" % (msg, task_id))
+        self.pool.log_info("[DONE ] %s" % msg)
 
     def _get_image_conf(self, compose, config):
         """Get image-build.conf from git repo.

pungi/phases/osbuild.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
-from kobo.threads import ThreadPool
+from kobo.threads import ThreadPool, WorkerThread
 from kobo import shortcuts
 from productmd.images import Image
 
@@ -10,22 +10,6 @@ from .. import util
 from ..linker import Linker
 from ..wrappers import kojiwrapper
 from .image_build import EXTENSIONS
-from ..threading import TelemetryWorkerThread as WorkerThread
-
-# copy and modify EXTENSIONS with some that osbuild produces but which
-# do not exist as `koji image-build` formats
-OSBUILDEXTENSIONS = EXTENSIONS.copy()
-OSBUILDEXTENSIONS.update(
-    # The key is the type_name as used in Koji archive, the second is a list of
-    # expected file extensions.
-    {
-        "iso": ["iso"],
-        "vhd-compressed": ["vhd.gz", "vhd.xz"],
-        # The image is technically wsl2, but the type_name in Koji is set to
-        # wsl.
-        "wsl": ["wsl"],
-    }
-)
 
 
 class OSBuildPhase(
@@ -175,10 +159,6 @@ 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(
@@ -201,7 +181,7 @@ class RunOSBuildThread(WorkerThread):
         )
         if koji.watch_task(task_id, log_file) != 0:
             raise RuntimeError(
-                "OSBuild task failed: %s. See %s for details" % (task_id, log_file)
+                "OSBuild: task %s failed: see %s for details" % (task_id, log_file)
             )
 
         # Refresh koji session which may have timed out while the task was
@@ -219,7 +199,7 @@ class RunOSBuildThread(WorkerThread):
         # architecture, but we don't verify that.
         build_info = koji.koji_proxy.getBuild(build_id)
         for archive in koji.koji_proxy.listArchives(buildID=build_id):
-            if archive["type_name"] not in OSBUILDEXTENSIONS:
+            if archive["type_name"] not in EXTENSIONS:
                 # Ignore values that are not of required types.
                 continue
 
@@ -257,7 +237,7 @@ class RunOSBuildThread(WorkerThread):
 
             linker.link(src_file, image_dest, link_type=compose.conf["link_type"])
 
-            for suffix in OSBUILDEXTENSIONS[archive["type_name"]]:
+            for suffix in EXTENSIONS[archive["type_name"]]:
                 if archive["filename"].endswith(suffix):
                     break
             else:
@@ -274,13 +254,7 @@ class RunOSBuildThread(WorkerThread):
             # determine the manifest type based on the koji output
             img.type = config.get("manifest_type")
             if not img.type:
-                if archive["type_name"] == "wsl":
+                if archive["type_name"] != "iso":
-                    # productmd only knows wsl2 as type, so let's translate
-                    # from the koji type so that users don't need to set the
-                    # type explicitly. There really is no other possible type
-                    # here anyway.
-                    img.type = "wsl2"
-                elif archive["type_name"] != "iso":
                     img.type = archive["type_name"]
                 else:
                     fn = archive["filename"].lower()

pungi/phases/ostree.py

@@ -4,7 +4,7 @@ import copy
 import json
 import os
 from kobo import shortcuts
-from kobo.threads import ThreadPool
+from kobo.threads import ThreadPool, WorkerThread
 from collections import OrderedDict
 
 from pungi.arch_utils import getBaseArch
@@ -14,7 +14,6 @@ from .. import util
 from ..ostree.utils import get_ref_from_treefile, get_commitid_from_commitid_file
 from ..util import get_repo_dicts, translate_path
 from ..wrappers import scm
-from ..threading import TelemetryWorkerThread as WorkerThread
 
 
 class OSTreePhase(ConfigGuardedPhase):
@@ -86,7 +85,7 @@ class OSTreeThread(WorkerThread):
         comps_repo = compose.paths.work.comps_repo(
             "$basearch", variant=variant, create_dir=False
         )
-        repos = shortcuts.force_list(config.get("repo", [])) + self.repos
+        repos = shortcuts.force_list(config["repo"]) + self.repos
         if compose.has_comps:
             repos.append(translate_path(compose, comps_repo))
         repos = get_repo_dicts(repos, logger=self.pool)

pungi/phases/ostree_container.py

@@ -1,188 +0,0 @@
-# -*- 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
-    ):
-        subvariant = config.get("subvariant", variant.uid)
-        target_dir = compose.paths.compose.image_dir(variant) % {"arch": arch}
-        util.makedirs(target_dir)
-        version = util.version_generator(compose, config.get("version"))
-        anb = config.get("name", "%s-%s" % (compose.conf["release_short"], subvariant))
-        archive_name = "%s-%s-%s" % (anb, arch, 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, text=True, errors="replace")
-
-        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)
-
-        # these are hardcoded as they should always be correct, we
-        # could potentially allow overriding them via config though
-        img.type = "bootable-container"
-        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 = subvariant
-        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,
-        )

pungi/phases/ostree_installer.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 import os
-from kobo.threads import ThreadPool
+from kobo.threads import ThreadPool, WorkerThread
-import shlex
 import shutil
 from productmd import images
+from six.moves import shlex_quote
 from kobo import shortcuts
 
 from .base import ConfigGuardedPhase, PhaseLoggerMixin
@@ -20,7 +20,6 @@ from ..util import (
 )
 from ..wrappers import iso, lorax, scm
 from ..runroot import Runroot
-from ..threading import TelemetryWorkerThread as WorkerThread
 
 
 class OstreeInstallerPhase(PhaseLoggerMixin, ConfigGuardedPhase):
@@ -276,8 +275,8 @@ class OstreeInstallerThread(WorkerThread):
                 skip_branding=config.get("skip_branding"),
             )
             cmd = "rm -rf %s && %s" % (
-                shlex.quote(output_dir),
+                shlex_quote(output_dir),
-                " ".join([shlex.quote(x) for x in lorax_cmd]),
+                " ".join([shlex_quote(x) for x in lorax_cmd]),
             )
 
             runroot.run(

pungi/phases/pkgset/pkgsets.py

@@ -22,10 +22,8 @@ It automatically finds a signed copies according to *sigkey_ordering*.
 import itertools
 import json
 import os
-import pickle
 import time
-import pgpy
+from six.moves import cPickle as pickle
-import rpm
 from functools import partial
 
 import kobo.log
@@ -33,12 +31,11 @@ import kobo.pkgset
 import kobo.rpmlib
 from kobo.shortcuts import compute_file_checksums
 
-from kobo.threads import ThreadPool
+from kobo.threads import WorkerThread, ThreadPool
 
 from pungi.util import pkg_is_srpm, copy_all
 from pungi.arch import get_valid_arches, is_excluded
 from pungi.errors import UnsignedPackagesError
-from pungi.threading import TelemetryWorkerThread as WorkerThread
 
 
 class ExtendedRpmWrapper(kobo.pkgset.SimpleRpmWrapper):
@@ -155,15 +152,9 @@ class PackageSetBase(kobo.log.LoggingBase):
         """
 
         def nvr_formatter(package_info):
-            epoch_suffix = ''
+            # joins NVR parts of the package with '-' character.
-            if package_info['epoch'] is not None:
+            return "-".join(
-                epoch_suffix = ':' + package_info['epoch']
+                (package_info["name"], package_info["version"], package_info["release"])
-            return (
-                f"{package_info['name']}"
-                f"{epoch_suffix}-"
-                f"{package_info['version']}-"
-                f"{package_info['release']}."
-                f"{package_info['arch']}"
             )
 
         def get_error(sigkeys, infos):
@@ -274,7 +265,7 @@ class PackageSetBase(kobo.log.LoggingBase):
         for arch in arch_list:
             self.rpms_by_arch.setdefault(arch, [])
             for i in other.rpms_by_arch.get(arch, []):
-                if i.file_path in self.file_cache.file_cache:
+                if i.file_path in self.file_cache:
                     # TODO: test if it really works
                     continue
                 if inherit_to_noarch and exclusivearch_list and arch == "noarch":
@@ -512,8 +503,7 @@ class KojiPackageSet(PackageSetBase):
 
         response = None
         if self.cache_region:
-            cache_key = "%s.get_latest_rpms_%s_%s_%s" % (
+            cache_key = "KojiPackageSet.get_latest_rpms_%s_%s_%s" % (
-                str(self.__class__.__name__),
                 str(tag),
                 str(event),
                 str(inherit),
@@ -535,8 +525,6 @@ class KojiPackageSet(PackageSetBase):
 
         return response
 
-
-
     def get_package_path(self, queue_item):
         rpm_info, build_info = queue_item
 
@@ -548,14 +536,22 @@ class KojiPackageSet(PackageSetBase):
         pathinfo = self.koji_wrapper.koji_module.pathinfo
         paths = []
 
-        def checksum_validator(keyname, pkg_path):
+        if "getRPMChecksums" in self.koji_proxy.system.listMethods():
-            checksums = self.koji_proxy.getRPMChecksums(
+
-                rpm_info["id"], checksum_types=("sha256",)
+            def checksum_validator(keyname, pkg_path):
-            )
+                checksums = self.koji_proxy.getRPMChecksums(
-            if "sha256" in checksums.get(keyname, {}):
+                    rpm_info["id"], checksum_types=("sha256",)
-                computed = compute_file_checksums(pkg_path, ("sha256",))
+                )
-                if computed["sha256"] != checksums[keyname]["sha256"]:
+                if "sha256" in checksums.get(keyname, {}):
-                    raise RuntimeError("Checksum mismatch for %s" % pkg_path)
+                    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:
@@ -765,7 +761,6 @@ class KojiPackageSet(PackageSetBase):
                         "exclusive_noarch": compose.conf[
                             "pkgset_exclusive_arch_considers_noarch"
                         ],
-                        "module_defaults_dir": compose.conf.get("module_defaults_dir"),
                     },
                     f,
                     protocol=pickle.HIGHEST_PROTOCOL,
@@ -862,7 +857,6 @@ class KojiPackageSet(PackageSetBase):
 
         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
@@ -874,7 +868,6 @@ class KojiPackageSet(PackageSetBase):
             # 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)
@@ -889,67 +882,6 @@ class KojiPackageSet(PackageSetBase):
             return False
 
 
-class KojiMockPackageSet(KojiPackageSet):
-
-    def _is_rpm_signed(self, rpm_path) -> bool:
-        ts = rpm.TransactionSet()
-        ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
-        sigkeys = [
-            sigkey.lower() for sigkey in self.sigkey_ordering
-            if sigkey is not None
-        ]
-        if not sigkeys:
-            return True
-        with open(rpm_path, 'rb') as fd:
-            header = ts.hdrFromFdno(fd)
-            signature = header[rpm.RPMTAG_SIGGPG] or header[rpm.RPMTAG_SIGPGP]
-            if signature is None:
-                return False
-            pgp_msg = pgpy.PGPMessage.from_blob(signature)
-            return any(
-                signature.signer.lower() in sigkeys
-                for signature in pgp_msg.signatures
-            )
-
-    def get_package_path(self, queue_item):
-        rpm_info, build_info = queue_item
-
-        # 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"]
-
-        # we replaced this part because pungi uses way
-        # of guessing path of package on koji based on sigkey
-        # we don't need that because all our packages will
-        # be ready for release
-        # signature verification is still done during deps resolution
-        pathinfo = self.koji_wrapper.koji_module.pathinfo
-
-        rpm_path = os.path.join(pathinfo.topdir, pathinfo.rpm(rpm_info))
-        if os.path.isfile(rpm_path):
-            if not self._is_rpm_signed(rpm_path):
-                self._invalid_sigkey_rpms.append(rpm_info)
-                self.log_error(
-                    'RPM "%s" not found for sigs: "%s". Path checked: "%s"',
-                    rpm_info, self.sigkey_ordering, rpm_path
-                )
-                return
-            return rpm_path
-        else:
-            self.log_warning("RPM %s not found" % rpm_path)
-            return None
-
-    def populate(self, tag, event=None, inherit=True, include_packages=None):
-        result = super().populate(
-            tag=tag,
-            event=event,
-            inherit=inherit,
-            include_packages=include_packages,
-        )
-        return result
-
-
 def _is_src(rpm_info):
     """Check if rpm info object returned by Koji refers to source packages."""
     return rpm_info["arch"] in ("src", "nosrc")

pungi/phases/pkgset/sources/__init__.py

@@ -15,10 +15,8 @@
 
 from .source_koji import PkgsetSourceKoji
 from .source_repos import PkgsetSourceRepos
-from .source_kojimock import PkgsetSourceKojiMock
 
 ALL_SOURCES = {
     "koji": PkgsetSourceKoji,
     "repos": PkgsetSourceRepos,
-    "kojimock": PkgsetSourceKojiMock,
 }

pungi/phases/pkgset/sources/source_koji.py

@@ -222,7 +222,6 @@ 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
@@ -236,9 +235,7 @@ def _add_module_to_variant(
             # in basearch. This assumes that each arch in the build maps to a
             # unique basearch.
             _, arch, _ = filename.split(".")
-            basearch = getBaseArch(arch)
+            filename = "modulemd.%s.txt" % getBaseArch(arch)
-            filename = "modulemd.%s.txt" % basearch
-            available_arches.add(basearch)
         except ValueError:
             pass
         mmds[filename] = file_path
@@ -263,12 +260,6 @@ 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(

pungi/phases/pkgset/sources/source_repos.py

@@ -15,6 +15,7 @@
 
 
 import os
+import shutil
 
 from kobo.shortcuts import run
 
@@ -75,6 +76,7 @@ def get_pkgset_from_repos(compose):
         pungi_dir = compose.paths.work.pungi_download_dir(arch)
 
         backends = {
+            "yum": pungi.get_pungi_cmd,
             "dnf": pungi.get_pungi_cmd_dnf,
         }
         get_cmd = backends[compose.conf["gather_backend"]]
@@ -91,6 +93,8 @@ def get_pkgset_from_repos(compose):
             cache_dir=compose.paths.work.pungi_cache_dir(arch=arch),
             profiler=profiler,
         )
+        if compose.conf["gather_backend"] == "yum":
+            cmd.append("--force")
 
         # TODO: runroot
         run(cmd, logfile=pungi_log, show_cmd=True, stdout=False)
@@ -107,6 +111,17 @@ def get_pkgset_from_repos(compose):
                 flist.append(dst)
                 pool.queue_put((src, dst))
 
+        # Clean up tmp dir
+        # Workaround for rpm not honoring sgid bit which only appears when yum is used.
+        yumroot_dir = os.path.join(pungi_dir, "work", arch, "yumroot")
+        if os.path.isdir(yumroot_dir):
+            try:
+                shutil.rmtree(yumroot_dir)
+            except Exception as e:
+                compose.log_warning(
+                    "Failed to clean up tmp dir: %s %s" % (yumroot_dir, str(e))
+                )
+
     msg = "Linking downloaded pkgset packages"
     compose.log_info("[BEGIN] %s" % msg)
     pool.start()

pungi/phases/repoclosure.py

@@ -101,48 +101,27 @@ def run_repoclosure(compose):
 
 
 def _delete_repoclosure_cache_dirs(compose):
-    """Find any cached repodata and delete it. The case is not going to be
+    if "dnf" == compose.conf["repoclosure_backend"]:
-    reused ever again, and would otherwise consume storage space.
-
-    DNF will use a different directory depending on whether it is running as
-    root or not. It is not easy to tell though if DNF 4 or 5 is being used, so
-    let's be sure and check both locations. All our cached entries are prefixed
-    by compose ID, so there's very limited amount of risk that we would delete
-    something incorrect.
-    """
-    cache_dirs = []
-
-    try:
-        # DNF 4
         from dnf.const import SYSTEM_CACHEDIR
         from dnf.util import am_i_root
         from dnf.yum.misc import getCacheDir
 
         if am_i_root():
-            cache_dirs.append(SYSTEM_CACHEDIR)
+            top_cache_dir = SYSTEM_CACHEDIR
         else:
-            cache_dirs.append(getCacheDir())
+            top_cache_dir = getCacheDir()
-    except ImportError:
+    else:
-        pass
+        from yum.misc import getCacheDir
 
-    try:
+        top_cache_dir = getCacheDir()
-        # DNF 5 config works directly for root, no need for special case.
-        import libdnf5
 
-        base = libdnf5.base.Base()
+    for name in os.listdir(top_cache_dir):
-        config = base.get_config()
+        if name.startswith(compose.compose_id):
-        cache_dirs.append(config.cachedir)
+            cache_path = os.path.join(top_cache_dir, name)
-    except ImportError:
+            if os.path.isdir(cache_path):
-        pass
+                shutil.rmtree(cache_path)
-
+            else:
-    for top_cache_dir in cache_dirs:
+                os.remove(cache_path)
-        for name in os.listdir(top_cache_dir):
-            if name.startswith(compose.compose_id):
-                cache_path = os.path.join(top_cache_dir, name)
-                if os.path.isdir(cache_path):
-                    shutil.rmtree(cache_path)
-                else:
-                    os.remove(cache_path)
 
 
 def _run_repoclosure_cmd(compose, repos, lookaside, arches, logfile):

pungi/phases/test.py

@@ -95,7 +95,7 @@ def is_iso(f):
 
 
 def has_mbr(f):
-    return _check_magic(f, 0x1FE, b"\x55\xaa")
+    return _check_magic(f, 0x1FE, b"\x55\xAA")
 
 
 def has_gpt(f):

pungi/phases/weaver.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from kobo import shortcuts
-from kobo.threads import ThreadPool
+from kobo.threads import ThreadPool, WorkerThread
-
-from pungi.threading import TelemetryWorkerThread as WorkerThread
 
 
 class WeaverPhase(object):

pungi/runroot.py

@@ -13,18 +13,13 @@
 # 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 shlex
+import six
-import shutil
+from six.moves import shlex_quote
-import tarfile
-
-import requests
 import kobo.log
 from kobo.shortcuts import run
 
-from pungi import util
 from pungi.wrappers import kojiwrapper
 
 
@@ -99,7 +94,7 @@ class Runroot(kobo.log.LoggingBase):
         log_file = os.path.join(log_dir, "program.log")
         try:
             with open(log_file) as f:
-                for line in f.readlines():
+                for line in f:
                     if "losetup: cannot find an unused loop device" in line:
                         return True
                     if re.match("losetup: .* failed to set up loop device", line):
@@ -156,7 +151,7 @@ class Runroot(kobo.log.LoggingBase):
         formatted_cmd = command.format(**fmt_dict) if fmt_dict else command
         ssh_cmd = ["ssh", "-oBatchMode=yes", "-n", "-l", user, hostname, formatted_cmd]
         output = run(ssh_cmd, show_cmd=True, logfile=log_file)[1]
-        if isinstance(output, bytes):
+        if six.PY3 and isinstance(output, bytes):
             return output.decode()
         else:
             return output
@@ -183,7 +178,7 @@ class Runroot(kobo.log.LoggingBase):
         # If the output dir is defined, change the permissions of files generated
         # by the runroot task, so the Pungi user can access them.
         if chown_paths:
-            paths = " ".join(shlex.quote(pth) for pth in chown_paths)
+            paths = " ".join(shlex_quote(pth) for pth in chown_paths)
             command += " ; EXIT_CODE=$?"
             # Make the files world readable
             command += " ; chmod -R a+r %s" % paths
@@ -235,9 +230,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"] = (
+            fmt_dict[
-                "rpm -qa --qf='%{name}-%{version}-%{release}.%{arch}\n'"
+                "command"
-            )
+            ] = "rpm -qa --qf='%{name}-%{version}-%{release}.%{arch}\n'"
             buildroot_rpms = self._ssh_run(
                 hostname,
                 user,
@@ -319,8 +314,7 @@ class Runroot(kobo.log.LoggingBase):
             arch,
             args,
             channel=runroot_channel,
-            # We want to change owner only if shared NFS directory is used.
+            chown_uid=os.getuid(),
-            chown_uid=os.getuid() if kwargs.get("mounts") else None,
             **kwargs
         )
 
@@ -331,7 +325,6 @@ 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):
         """
@@ -388,75 +381,3 @@ 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)
-    tmp_dir = compose.mkdtemp(prefix="buildinstall-download")
-    try:
-        local_path = _download_archive(task_id, fname, archive_url, tmp_dir)
-        _extract_archive(task_id, fname, local_path, destination)
-    finally:
-        shutil.rmtree(tmp_dir, ignore_errors=True)

pungi/scripts/config_dump.py

@@ -4,12 +4,13 @@ from __future__ import absolute_import
 from __future__ import print_function
 
 import argparse
-import configparser
 import json
 import os
 import shutil
 import sys
 
+from six.moves import configparser
+
 import kobo.conf
 import pungi.checks
 import pungi.util

pungi/scripts/config_validate.py

@@ -8,6 +8,8 @@ import json
 import os
 import sys
 
+import six
+
 import pungi.checks
 import pungi.compose
 import pungi.paths
@@ -54,7 +56,7 @@ class ValidationCompose(pungi.compose.Compose):
 def read_variants(compose, config):
     with pungi.util.temp_dir() as tmp_dir:
         scm_dict = compose.conf["variants_file"]
-        if isinstance(scm_dict, str) and scm_dict[0] != "/":
+        if isinstance(scm_dict, six.string_types) and scm_dict[0] != "/":
             config_dir = os.path.dirname(config)
             scm_dict = os.path.join(config_dir, scm_dict)
         files = pungi.wrappers.scm.get_file_from_scm(scm_dict, tmp_dir)
@@ -126,6 +128,7 @@ 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),

pungi/scripts/create_extra_repo.py

@@ -1,441 +0,0 @@
-# coding=utf-8
-
-import argparse
-import os
-import subprocess
-import tempfile
-from shutil import rmtree
-from typing import (
-    AnyStr,
-    List,
-    Dict,
-    Optional,
-)
-
-import createrepo_c as cr
-import requests
-import yaml
-from dataclasses import dataclass, field
-
-from .create_packages_json import (
-    PackagesGenerator,
-    RepoInfo,
-    VariantInfo,
-)
-
-
-@dataclass
-class ExtraVariantInfo(VariantInfo):
-
-    modules: List[AnyStr] = field(default_factory=list)
-    packages: List[AnyStr] = field(default_factory=list)
-
-
-class CreateExtraRepo(PackagesGenerator):
-
-    def __init__(
-            self,
-            variants: List[ExtraVariantInfo],
-            bs_auth_token: AnyStr,
-            local_repository_path: AnyStr,
-            clear_target_repo: bool = True,
-    ):
-        self.variants = []  # type: List[ExtraVariantInfo]
-        super().__init__(variants, [], [])
-        self.auth_headers = {
-            'Authorization': f'Bearer {bs_auth_token}',
-        }
-        # modules data of modules.yaml.gz from an existing local repo
-        self.local_modules_data = []
-        self.local_repository_path = local_repository_path
-        # path to modules.yaml, which generated by the class
-        self.default_modules_yaml_path = os.path.join(
-            local_repository_path,
-            'modules.yaml',
-        )
-        if clear_target_repo:
-            if os.path.exists(self.local_repository_path):
-                rmtree(self.local_repository_path)
-            os.makedirs(self.local_repository_path, exist_ok=True)
-        else:
-            self._read_local_modules_yaml()
-
-    def _read_local_modules_yaml(self):
-        """
-        Read modules data from an existin local repo
-        """
-        repomd_file_path = os.path.join(
-            self.local_repository_path,
-            'repodata',
-            'repomd.xml',
-        )
-        repomd_object = self._parse_repomd(repomd_file_path)
-        for repomd_record in repomd_object.records:
-            if repomd_record.type != 'modules':
-                continue
-            modules_yaml_path = os.path.join(
-                self.local_repository_path,
-                repomd_record.location_href,
-            )
-            self.local_modules_data = list(self._parse_modules_file(
-                modules_yaml_path,
-            ))
-            break
-
-    def _dump_local_modules_yaml(self):
-        """
-        Dump merged modules data to an local repo
-        """
-        if self.local_modules_data:
-            with open(self.default_modules_yaml_path, 'w') as yaml_file:
-                yaml.dump_all(
-                    self.local_modules_data,
-                    yaml_file,
-                )
-
-    @staticmethod
-    def get_repo_info_from_bs_repo(
-            auth_token: AnyStr,
-            build_id: AnyStr,
-            arch: AnyStr,
-            packages: Optional[List[AnyStr]] = None,
-            modules: Optional[List[AnyStr]] = None,
-    ) -> List[ExtraVariantInfo]:
-        """
-        Get info about a BS repo and save it to
-            an object of class ExtraRepoInfo
-        :param auth_token: Auth token to Build System
-        :param build_id: ID of a build from BS
-        :param arch: an architecture of repo which will be used
-        :param packages: list of names of packages which will be put to an
-                         local repo from a BS repo
-        :param modules: list of names of modules which will be put to an
-                        local repo from a BS repo
-        :return: list of ExtraRepoInfo with info about the BS repos
-        """
-
-        bs_url = 'https://build.cloudlinux.com'
-        api_uri = 'api/v1'
-        bs_repo_suffix = 'build_repos'
-
-        variants_info = []
-
-        # get the full info about a BS repo
-        repo_request = requests.get(
-            url=os.path.join(
-                bs_url,
-                api_uri,
-                'builds',
-                build_id,
-            ),
-            headers={
-                'Authorization': f'Bearer {auth_token}',
-            },
-        )
-        repo_request.raise_for_status()
-        result = repo_request.json()
-        for build_platform in result['build_platforms']:
-            platform_name = build_platform['name']
-            for architecture in build_platform['architectures']:
-                # skip repo with unsuitable architecture
-                if architecture != arch:
-                    continue
-                variant_info = ExtraVariantInfo(
-                    name=f'{build_id}-{platform_name}-{architecture}',
-                    arch=architecture,
-                    packages=packages,
-                    modules=modules,
-                    repos=[
-                        RepoInfo(
-                            path=os.path.join(
-                                bs_url,
-                                bs_repo_suffix,
-                                build_id,
-                                platform_name,
-                            ),
-                            folder=architecture,
-                            is_remote=True,
-                        )
-                    ]
-                )
-                variants_info.append(variant_info)
-        return variants_info
-
-    def _create_local_extra_repo(self):
-        """
-        Call `createrepo_c <path_to_repo>` for creating a local repo
-        """
-        subprocess.call(
-            f'createrepo_c {self.local_repository_path}',
-            shell=True,
-        )
-        # remove an unnecessary temporary modules.yaml
-        if os.path.exists(self.default_modules_yaml_path):
-            os.remove(self.default_modules_yaml_path)
-
-    def get_remote_file_content(
-            self,
-            file_url: AnyStr,
-    ) -> AnyStr:
-        """
-        Get content from a remote file and write it to a temp file
-        :param file_url: url of a remote file
-        :return: path to a temp file
-        """
-
-        file_request = requests.get(
-            url=file_url,
-            # for the case when we get a file from BS
-            headers=self.auth_headers,
-        )
-        file_request.raise_for_status()
-        with tempfile.NamedTemporaryFile(delete=False) as file_stream:
-            file_stream.write(file_request.content)
-        return file_stream.name
-
-    def _download_rpm_to_local_repo(
-            self,
-            package_location: AnyStr,
-            repo_info: RepoInfo,
-    ) -> None:
-        """
-        Download a rpm package from a remote repo and save it to a local repo
-        :param package_location: relative uri of a package in a remote repo
-        :param repo_info: info about a remote repo which contains a specific
-                          rpm package
-        """
-        rpm_package_remote_path = os.path.join(
-            repo_info.path,
-            repo_info.folder,
-            package_location,
-        )
-        rpm_package_local_path = os.path.join(
-            self.local_repository_path,
-            os.path.basename(package_location),
-        )
-        rpm_request = requests.get(
-            url=rpm_package_remote_path,
-            headers=self.auth_headers,
-        )
-        rpm_request.raise_for_status()
-        with open(rpm_package_local_path, 'wb') as rpm_file:
-            rpm_file.write(rpm_request.content)
-
-    def _download_packages(
-            self,
-            packages: Dict[AnyStr, cr.Package],
-            variant_info: ExtraVariantInfo
-    ):
-        """
-        Download all defined packages from a remote repo
-        :param packages: information about all packages (including
-                         modularity) in a remote repo
-        :param variant_info: information about a remote variant
-        """
-        for package in packages.values():
-            package_name = package.name
-            # Skip a current package from a remote repo if we defined
-            # the list packages and a current package doesn't belong to it
-            if variant_info.packages and \
-                    package_name not in variant_info.packages:
-                continue
-            for repo_info in variant_info.repos:
-                self._download_rpm_to_local_repo(
-                    package_location=package.location_href,
-                    repo_info=repo_info,
-                )
-
-    def _download_modules(
-            self,
-            modules_data: List[Dict],
-            variant_info: ExtraVariantInfo,
-            packages: Dict[AnyStr, cr.Package]
-    ):
-        """
-        Download all defined modularity packages and their data from
-            a remote repo
-        :param modules_data: information about all modules in a remote repo
-        :param variant_info: information about a remote variant
-        :param packages: information about all packages (including
-                         modularity) in a remote repo
-        """
-        for module in modules_data:
-            module_data = module['data']
-            # Skip a current module from a remote repo if we defined
-            # the list modules and a current module doesn't belong to it
-            if variant_info.modules and \
-                    module_data['name'] not in variant_info.modules:
-                continue
-            # we should add info about a module if the local repodata
-            # doesn't have it
-            if module not in self.local_modules_data:
-                self.local_modules_data.append(module)
-            # just skip a module's record if it doesn't have rpm artifact
-            if module['document'] != 'modulemd' or \
-                    'artifacts' not in module_data or \
-                    'rpms' not in module_data['artifacts']:
-                continue
-            for rpm in module['data']['artifacts']['rpms']:
-                # Empty repo_info.packages means that we will download
-                # all packages from repo including
-                # the modularity packages
-                if not variant_info.packages:
-                    break
-                # skip a rpm if it doesn't belong to a processed repo
-                if rpm not in packages:
-                    continue
-                for repo_info in variant_info.repos:
-                    self._download_rpm_to_local_repo(
-                        package_location=packages[rpm].location_href,
-                        repo_info=repo_info,
-                    )
-
-    def create_extra_repo(self):
-        """
-        1. Get from the remote repos the specific (or all) packages/modules
-        2. Save them to a local repo
-        3. Save info about the modules to a local repo
-        3. Call `createrepo_c` which creates a local repo
-           with the right repodata
-        """
-        for variant_info in self.variants:
-            for repo_info in variant_info.repos:
-                repomd_records = self._get_repomd_records(
-                    repo_info=repo_info,
-                )
-                packages_iterator = self.get_packages_iterator(repo_info)
-                # parse the repodata (including modules.yaml.gz)
-                modules_data = self._parse_module_repomd_record(
-                    repo_info=repo_info,
-                    repomd_records=repomd_records,
-                )
-                # convert the packages dict to more usable form
-                # for future checking that a rpm from the module's artifacts
-                # belongs to a processed repository
-                packages = {
-                    f'{package.name}-{package.epoch}:{package.version}-'
-                    f'{package.release}.{package.arch}':
-                        package for package in packages_iterator
-                }
-                self._download_modules(
-                    modules_data=modules_data,
-                    variant_info=variant_info,
-                    packages=packages,
-                )
-                self._download_packages(
-                    packages=packages,
-                    variant_info=variant_info,
-                )
-
-        self._dump_local_modules_yaml()
-        self._create_local_extra_repo()
-
-
-def create_parser():
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        '--bs-auth-token',
-        help='Auth token for Build System',
-    )
-    parser.add_argument(
-        '--local-repo-path',
-        help='Path to a local repo. E.g. /var/repo/test_repo',
-        required=True,
-    )
-    parser.add_argument(
-        '--clear-local-repo',
-        help='Clear a local repo before creating a new',
-        action='store_true',
-        default=False,
-    )
-    parser.add_argument(
-        '--repo',
-        action='append',
-        help='Path to a folder with repofolders or build id. E.g. '
-             '"http://koji.cloudlinux.com/mirrors/rhel_mirror" or '
-             '"601809b3c2f5b0e458b14cd3"',
-        required=True,
-    )
-    parser.add_argument(
-        '--repo-folder',
-        action='append',
-        help='A folder which contains folder repodata . E.g. "baseos-stream"',
-        required=True,
-    )
-    parser.add_argument(
-        '--repo-arch',
-        action='append',
-        help='What architecture packages a repository contains. E.g. "x86_64"',
-        required=True,
-    )
-    parser.add_argument(
-        '--packages',
-        action='append',
-        type=str,
-        default=[],
-        help='A list of packages names which we want to download to local '
-             'extra repo. We will download all of packages if param is empty',
-        required=True,
-    )
-    parser.add_argument(
-        '--modules',
-        action='append',
-        type=str,
-        default=[],
-        help='A list of modules names which we want to download to local '
-             'extra repo. We will download all of modules if param is empty',
-        required=True,
-    )
-
-    return parser
-
-
-def cli_main():
-    args = create_parser().parse_args()
-    repos_info = []
-    for repo, repo_folder, repo_arch, packages, modules in zip(
-        args.repo,
-        args.repo_folder,
-        args.repo_arch,
-        args.packages,
-        args.modules,
-    ):
-        modules = modules.split()
-        packages = packages.split()
-        if repo.startswith('http://'):
-            repos_info.append(
-                ExtraVariantInfo(
-                    name=repo_folder,
-                    arch=repo_arch,
-                    repos=[
-                        RepoInfo(
-                            path=repo,
-                            folder=repo_folder,
-                            is_remote=True,
-                        )
-                    ],
-                    modules=modules,
-                    packages=packages,
-                )
-            )
-        else:
-            repos_info.extend(
-                CreateExtraRepo.get_repo_info_from_bs_repo(
-                    auth_token=args.bs_auth_token,
-                    build_id=repo,
-                    arch=repo_arch,
-                    modules=modules,
-                    packages=packages,
-                )
-            )
-    cer = CreateExtraRepo(
-        variants=repos_info,
-        bs_auth_token=args.bs_auth_token,
-        local_repository_path=args.local_repo_path,
-        clear_target_repo=args.clear_local_repo,
-    )
-    cer.create_extra_repo()
-
-
-if __name__ == '__main__':
-    cli_main()

pungi/scripts/create_packages_json.py

@@ -1,514 +0,0 @@
-# coding=utf-8
-"""
-The tool allow to generate package.json. This file is used by pungi
-# as parameter `gather_prepopulate`
-Sample of using repodata files taken from
-https://github.com/rpm-software-management/createrepo_c/blob/master/examples/python/repodata_parsing.py
-"""
-
-import argparse
-import gzip
-import json
-import logging
-import lzma
-import os
-import re
-import tempfile
-from collections import defaultdict
-from itertools import tee
-from pathlib import Path
-from typing import (
-    AnyStr,
-    Dict,
-    List,
-    Any,
-    Iterator,
-    Optional,
-    Tuple,
-    Union,
-)
-
-import binascii
-from urllib.parse import urljoin
-
-import requests
-import rpm
-import yaml
-from createrepo_c import (
-    Package,
-    PackageIterator,
-    Repomd,
-    RepomdRecord,
-)
-from dataclasses import dataclass, field
-from kobo.rpmlib import parse_nvra
-
-logging.basicConfig(level=logging.INFO)
-
-
-def _is_compressed_file(first_two_bytes: bytes, initial_bytes: bytes):
-    return binascii.hexlify(first_two_bytes) == initial_bytes
-
-
-def is_gzip_file(first_two_bytes):
-    return _is_compressed_file(
-        first_two_bytes=first_two_bytes,
-        initial_bytes=b'1f8b',
-    )
-
-
-def is_xz_file(first_two_bytes):
-    return _is_compressed_file(
-        first_two_bytes=first_two_bytes,
-        initial_bytes=b'fd37',
-    )
-
-
-@dataclass
-class RepoInfo:
-    # path to a directory with repo directories. E.g. '/var/repos' contains
-    # 'appstream', 'baseos', etc.
-    # Or 'http://koji.cloudlinux.com/mirrors/rhel_mirror' if you are
-    # using remote repo
-    path: str
-    # name of folder with a repodata folder. E.g. 'baseos', 'appstream', etc
-    folder: str
-    # Is a repo remote or local
-    is_remote: bool
-    # Is a reference repository (usually it's a RHEL repo)
-    # Layout of packages from such repository will be taken as example
-    # Only layout of specific package (which doesn't exist
-    # in a reference repository) will be taken as example
-    is_reference: bool = False
-    # The packages from 'present' repo will be added to a variant.
-    # The packages from 'absent' repo will be removed from a variant.
-    repo_type: str = 'present'
-
-
-@dataclass
-class VariantInfo:
-    # name of variant. E.g. 'BaseOS', 'AppStream', etc
-    name: AnyStr
-    # architecture of variant. E.g. 'x86_64', 'i686', etc
-    arch: AnyStr
-    # The packages which will be not added to a variant
-    excluded_packages: List[str] = field(default_factory=list)
-    # Repos of a variant
-    repos: List[RepoInfo] = field(default_factory=list)
-
-
-class PackagesGenerator:
-
-    repo_arches = defaultdict(lambda: list(('noarch',)))
-    addon_repos = {
-        'x86_64': ['i686'],
-        'ppc64le': [],
-        'aarch64': [],
-        's390x': [],
-        'i686': [],
-    }
-
-    def __init__(
-        self,
-        variants: List[VariantInfo],
-        excluded_packages: List[AnyStr],
-        included_packages: List[AnyStr],
-    ):
-        self.variants = variants
-        self.pkgs = dict()
-        self.excluded_packages = excluded_packages
-        self.included_packages = included_packages
-        self.tmp_files = []  # type: list[Path]
-        for arch, arch_list in self.addon_repos.items():
-            self.repo_arches[arch].extend(arch_list)
-            self.repo_arches[arch].append(arch)
-
-    def __del__(self):
-        for tmp_file in self.tmp_files:
-            if tmp_file.exists():
-                tmp_file.unlink()
-
-    @staticmethod
-    def _get_full_repo_path(repo_info: RepoInfo):
-        result = os.path.join(
-            repo_info.path,
-            repo_info.folder
-        )
-        if repo_info.is_remote:
-            result = urljoin(
-                repo_info.path + '/',
-                repo_info.folder,
-            )
-        return result
-
-    @staticmethod
-    def _warning_callback(warning_type, message):
-        """
-        Warning callback for createrepo_c parsing functions
-        """
-        print(f'Warning message: "{message}"; warning type: "{warning_type}"')
-        return True
-
-    def get_remote_file_content(self, file_url: AnyStr) -> AnyStr:
-        """
-        Get content from a remote file and write it to a temp file
-        :param file_url: url of a remote file
-        :return: path to a temp file
-        """
-
-        file_request = requests.get(
-            url=file_url,
-        )
-        file_request.raise_for_status()
-        with tempfile.NamedTemporaryFile(delete=False) as file_stream:
-            file_stream.write(file_request.content)
-        self.tmp_files.append(Path(file_stream.name))
-        return file_stream.name
-
-    @staticmethod
-    def _parse_repomd(repomd_file_path: AnyStr) -> Repomd:
-        """
-        Parse file repomd.xml and create object Repomd
-        :param repomd_file_path: path to local repomd.xml
-        """
-        return Repomd(repomd_file_path)
-
-    @classmethod
-    def _parse_modules_file(
-            cls,
-            modules_file_path: AnyStr,
-
-    ) -> Iterator[Any]:
-        """
-        Parse modules.yaml.gz and returns parsed data
-        :param modules_file_path: path to local modules.yaml.gz
-        :return: List of dict for each module in a repo
-        """
-
-        with open(modules_file_path, 'rb') as modules_file:
-            data = modules_file.read()
-            if is_gzip_file(data[:2]):
-                data = gzip.decompress(data)
-            elif is_xz_file(data[:2]):
-                data = lzma.decompress(data)
-            return yaml.load_all(
-                data,
-                Loader=yaml.BaseLoader,
-            )
-
-    def _get_repomd_records(
-            self,
-            repo_info: RepoInfo,
-    ) -> List[RepomdRecord]:
-        """
-        Get, parse file repomd.xml and extract from it repomd records
-        :param repo_info: structure which contains info about a current repo
-        :return: list with repomd records
-        """
-        repomd_file_path = os.path.join(
-            repo_info.path,
-            repo_info.folder,
-            'repodata',
-            'repomd.xml',
-        )
-        if repo_info.is_remote:
-            repomd_file_path = urljoin(
-                urljoin(
-                    repo_info.path + '/',
-                    repo_info.folder
-                ) + '/',
-                'repodata/repomd.xml'
-            )
-            repomd_file_path = self.get_remote_file_content(repomd_file_path)
-
-        repomd_object = self._parse_repomd(repomd_file_path)
-        if repo_info.is_remote:
-            os.remove(repomd_file_path)
-        return repomd_object.records
-
-    def _download_repomd_records(
-            self,
-            repo_info: RepoInfo,
-            repomd_records: List[RepomdRecord],
-            repomd_records_dict: Dict[str, str],
-    ):
-        """
-        Download repomd records
-        :param repo_info: structure which contains info about a current repo
-        :param repomd_records: list with repomd records
-        :param repomd_records_dict: dict with paths to repodata files
-        """
-        for repomd_record in repomd_records:
-            if repomd_record.type not in (
-                    'primary',
-                    'filelists',
-                    'other',
-            ):
-                continue
-            repomd_record_file_path = os.path.join(
-                repo_info.path,
-                repo_info.folder,
-                repomd_record.location_href,
-            )
-            if repo_info.is_remote:
-                repomd_record_file_path = self.get_remote_file_content(
-                    repomd_record_file_path)
-            repomd_records_dict[repomd_record.type] = repomd_record_file_path
-
-    def _parse_module_repomd_record(
-            self,
-            repo_info: RepoInfo,
-            repomd_records: List[RepomdRecord],
-    ) -> List[Dict]:
-        """
-        Download repomd records
-        :param repo_info: structure which contains info about a current repo
-        :param repomd_records: list with repomd records
-        """
-        for repomd_record in repomd_records:
-            if repomd_record.type != 'modules':
-                continue
-            repomd_record_file_path = os.path.join(
-                repo_info.path,
-                repo_info.folder,
-                repomd_record.location_href,
-            )
-            if repo_info.is_remote:
-                repomd_record_file_path = self.get_remote_file_content(
-                    repomd_record_file_path)
-            return list(self._parse_modules_file(
-                repomd_record_file_path,
-            ))
-        return []
-
-    @staticmethod
-    def compare_pkgs_version(package_1: Package, package_2: Package) -> int:
-        version_tuple_1 = (
-            package_1.epoch,
-            package_1.version,
-            package_1.release,
-        )
-        version_tuple_2 = (
-            package_2.epoch,
-            package_2.version,
-            package_2.release,
-        )
-        return rpm.labelCompare(version_tuple_1, version_tuple_2)
-
-    def get_packages_iterator(
-            self,
-            repo_info: RepoInfo,
-    ) -> Union[PackageIterator, Iterator]:
-        full_repo_path = self._get_full_repo_path(repo_info)
-        pkgs_iterator = self.pkgs.get(full_repo_path)
-        if pkgs_iterator is None:
-            repomd_records = self._get_repomd_records(
-                repo_info=repo_info,
-            )
-            repomd_records_dict = {}  # type: Dict[str, str]
-            self._download_repomd_records(
-                repo_info=repo_info,
-                repomd_records=repomd_records,
-                repomd_records_dict=repomd_records_dict,
-            )
-            pkgs_iterator = PackageIterator(
-                primary_path=repomd_records_dict['primary'],
-                filelists_path=repomd_records_dict['filelists'],
-                other_path=repomd_records_dict['other'],
-                warningcb=self._warning_callback,
-            )
-            pkgs_iterator, self.pkgs[full_repo_path] = tee(pkgs_iterator)
-        return pkgs_iterator
-
-    def get_package_arch(
-            self,
-            package: Package,
-            variant_arch: str,
-    ) -> str:
-        result = variant_arch
-        if package.arch in self.repo_arches[variant_arch]:
-            result = package.arch
-        return result
-
-    def is_skipped_module_package(
-            self,
-            package: Package,
-            variant_arch: str,
-    ) -> bool:
-        package_key = self.get_package_key(package, variant_arch)
-        # Even a module package will be added to packages.json if
-        # it presents in the list of included packages
-        return 'module' in package.release and not any(
-            re.search(
-                f'^{included_pkg}$',
-                package_key,
-            ) or included_pkg in (package.name, package_key)
-            for included_pkg in self.included_packages
-        )
-
-    def is_excluded_package(
-            self,
-            package: Package,
-            variant_arch: str,
-            excluded_packages: List[str],
-    ) -> bool:
-        package_key = self.get_package_key(package, variant_arch)
-        return any(
-            re.search(
-                f'^{excluded_pkg}$',
-                package_key,
-            ) or excluded_pkg in (package.name, package_key)
-            for excluded_pkg in excluded_packages
-        )
-
-    @staticmethod
-    def get_source_rpm_name(package: Package) -> str:
-        source_rpm_nvra = parse_nvra(package.rpm_sourcerpm)
-        return source_rpm_nvra['name']
-
-    def get_package_key(self, package: Package, variant_arch: str) -> str:
-        return (
-            f'{package.name}.'
-            f'{self.get_package_arch(package, variant_arch)}'
-        )
-
-    def generate_packages_json(
-            self
-    ) -> Dict[AnyStr, Dict[AnyStr, Dict[AnyStr, List[AnyStr]]]]:
-        """
-        Generate packages.json
-        """
-        packages = defaultdict(lambda: defaultdict(lambda: {
-            'variants': list(),
-        }))
-        for variant_info in self.variants:
-            for repo_info in variant_info.repos:
-                is_reference = repo_info.is_reference
-                for package in self.get_packages_iterator(repo_info=repo_info):
-                    if self.is_skipped_module_package(
-                            package=package,
-                            variant_arch=variant_info.arch,
-                    ):
-                        continue
-                    if self.is_excluded_package(
-                        package=package,
-                        variant_arch=variant_info.arch,
-                        excluded_packages=self.excluded_packages,
-                    ):
-                        continue
-                    if self.is_excluded_package(
-                        package=package,
-                        variant_arch=variant_info.arch,
-                        excluded_packages=variant_info.excluded_packages,
-                    ):
-                        continue
-                    package_key = self.get_package_key(
-                        package,
-                        variant_info.arch,
-                    )
-                    source_rpm_name = self.get_source_rpm_name(package)
-                    package_info = packages[source_rpm_name][package_key]
-                    if 'is_reference' not in package_info:
-                        package_info['variants'].append(variant_info.name)
-                        package_info['is_reference'] = is_reference
-                        package_info['package'] = package
-                    elif not package_info['is_reference'] or \
-                            package_info['is_reference'] == is_reference and \
-                            self.compare_pkgs_version(
-                        package_1=package,
-                        package_2=package_info['package'],
-                    ) > 0:
-                        package_info['variants'] = [variant_info.name]
-                        package_info['is_reference'] = is_reference
-                        package_info['package'] = package
-                    elif self.compare_pkgs_version(
-                        package_1=package,
-                        package_2=package_info['package'],
-                    ) == 0 and repo_info.repo_type != 'absent':
-                        package_info['variants'].append(variant_info.name)
-        result = defaultdict(lambda: defaultdict(
-            lambda: defaultdict(list),
-        ))
-        for variant_info in self.variants:
-            for source_rpm_name, packages_info in packages.items():
-                for package_key, package_info in packages_info.items():
-                    variant_pkgs = result[variant_info.name][variant_info.arch]
-                    if variant_info.name not in package_info['variants']:
-                        continue
-                    variant_pkgs[source_rpm_name].append(package_key)
-        return result
-
-
-def create_parser():
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        '-c',
-        '--config',
-        type=Path,
-        default=Path('config.yaml'),
-        required=False,
-        help='Path to a config',
-    )
-    parser.add_argument(
-        '-o',
-        '--json-output-path',
-        type=str,
-        help='Full path to output json file',
-        required=True,
-    )
-
-    return parser
-
-
-def read_config(config_path: Path) -> Optional[Dict]:
-    if not config_path.exists():
-        logging.error('A config by path "%s" does not exist', config_path)
-        exit(1)
-    with config_path.open('r') as config_fd:
-        return yaml.safe_load(config_fd)
-
-
-def process_config(config_data: Dict) -> Tuple[
-    List[VariantInfo],
-    List[str],
-    List[str],
-]:
-    excluded_packages = config_data.get('excluded_packages', [])
-    included_packages = config_data.get('included_packages', [])
-    variants = [VariantInfo(
-        name=variant_name,
-        arch=variant_info['arch'],
-        excluded_packages=variant_info.get('excluded_packages', []),
-        repos=[RepoInfo(
-            path=variant_repo['path'],
-            folder=variant_repo['folder'],
-            is_remote=variant_repo['remote'],
-            is_reference=variant_repo['reference'],
-            repo_type=variant_repo.get('repo_type', 'present'),
-        ) for variant_repo in variant_info['repos']]
-    ) for variant_name, variant_info in config_data['variants'].items()]
-    return variants, excluded_packages, included_packages
-
-
-def cli_main():
-    args = create_parser().parse_args()
-    variants, excluded_packages, included_packages = process_config(
-        config_data=read_config(args.config)
-    )
-    pg = PackagesGenerator(
-        variants=variants,
-        excluded_packages=excluded_packages,
-        included_packages=included_packages,
-    )
-    result = pg.generate_packages_json()
-    with open(args.json_output_path, 'w') as packages_file:
-        json.dump(
-            result,
-            packages_file,
-            indent=4,
-            sort_keys=True,
-        )
-
-
-if __name__ == '__main__':
-    cli_main()

pungi/scripts/gather_modules.py

@@ -1,255 +0,0 @@
-import gzip
-import lzma
-import os
-from argparse import ArgumentParser, FileType
-from glob import iglob
-from io import BytesIO
-from pathlib import Path
-from typing import List, AnyStr, Iterable, Union, Optional
-import logging
-from urllib.parse import urljoin
-
-import yaml
-import createrepo_c as cr
-from typing.io import BinaryIO
-
-from .create_packages_json import PackagesGenerator, is_gzip_file, is_xz_file
-
-EMPTY_FILE = '.empty'
-
-
-def read_modules_yaml(modules_yaml_path: Union[str, Path]) -> BytesIO:
-    with open(modules_yaml_path, 'rb') as fp:
-        return BytesIO(fp.read())
-
-
-def grep_list_of_modules_yaml(repos_path: AnyStr) -> Iterable[BytesIO]:
-    """
-    Find all of valid *modules.yaml.gz in repos
-    :param repos_path: path to a directory which contains repo dirs
-    :return: iterable object of content from *modules.yaml.*
-    """
-
-    return (
-        read_modules_yaml_from_specific_repo(repo_path=Path(path).parent)
-        for path in iglob(
-            str(Path(repos_path).joinpath('**/repodata')),
-            recursive=True
-        )
-    )
-
-
-def _is_remote(path: str):
-    return any(str(path).startswith(protocol)
-               for protocol in ('http', 'https'))
-
-
-def read_modules_yaml_from_specific_repo(
-        repo_path: Union[str, Path]
-) -> Optional[BytesIO]:
-    """
-    Read modules_yaml from a specific repo (remote or local)
-    :param repo_path: path/url to a specific repo
-                      (final dir should contain dir `repodata`)
-    :return: iterable object of content from *modules.yaml.*
-    """
-
-    if _is_remote(repo_path):
-        repomd_url = urljoin(
-            repo_path + '/',
-            'repodata/repomd.xml',
-        )
-        packages_generator = PackagesGenerator(
-            variants=[],
-            excluded_packages=[],
-            included_packages=[],
-        )
-        repomd_file_path = packages_generator.get_remote_file_content(
-            file_url=repomd_url
-        )
-    else:
-        repomd_file_path = os.path.join(
-            repo_path,
-            'repodata/repomd.xml',
-        )
-    repomd_obj = cr.Repomd(str(repomd_file_path))
-    for record in repomd_obj.records:
-        if record.type != 'modules':
-            continue
-        else:
-            if _is_remote(repo_path):
-                modules_yaml_url = urljoin(
-                    repo_path + '/',
-                    record.location_href,
-                )
-                packages_generator = PackagesGenerator(
-                    variants=[],
-                    excluded_packages=[],
-                    included_packages=[],
-                )
-                modules_yaml_path = packages_generator.get_remote_file_content(
-                    file_url=modules_yaml_url
-                )
-            else:
-                modules_yaml_path = os.path.join(
-                    repo_path,
-                    record.location_href,
-                )
-            return read_modules_yaml(modules_yaml_path=modules_yaml_path)
-    else:
-        return None
-
-
-def _should_grep_defaults(
-        document_type: str,
-        grep_only_modules_data: bool = False,
-        grep_only_modules_defaults_data: bool = False,
-) -> bool:
-    xor_flag = grep_only_modules_data == grep_only_modules_defaults_data
-    if document_type == 'modulemd' and (xor_flag or grep_only_modules_data):
-        return True
-    return False
-
-
-def _should_grep_modules(
-        document_type: str,
-        grep_only_modules_data: bool = False,
-        grep_only_modules_defaults_data: bool = False,
-) -> bool:
-    xor_flag = grep_only_modules_data == grep_only_modules_defaults_data
-    if document_type == 'modulemd-defaults' and \
-            (xor_flag or grep_only_modules_defaults_data):
-        return True
-    return False
-
-
-def collect_modules(
-        modules_paths: List[BinaryIO],
-        target_dir: str,
-        grep_only_modules_data: bool = False,
-        grep_only_modules_defaults_data: bool = False,
-):
-    """
-    Read given modules.yaml.gz files and export modules
-    and modulemd files from it.
-    Returns:
-        object:
-    """
-    xor_flag = grep_only_modules_defaults_data is grep_only_modules_data
-    modules_path = os.path.join(target_dir, 'modules')
-    module_defaults_path = os.path.join(target_dir, 'module_defaults')
-    if grep_only_modules_data or xor_flag:
-        os.makedirs(modules_path, exist_ok=True)
-    if grep_only_modules_defaults_data or xor_flag:
-        os.makedirs(module_defaults_path, exist_ok=True)
-    # Defaults modules can be empty, but pungi detects
-    # empty folder while copying and raises the exception in this case
-    Path(os.path.join(module_defaults_path, EMPTY_FILE)).touch()
-
-    for module_file in modules_paths:
-        data = module_file.read()
-        if is_gzip_file(data[:2]):
-            data = gzip.decompress(data)
-        elif is_xz_file(data[:2]):
-            data = lzma.decompress(data)
-        documents = yaml.load_all(data, Loader=yaml.BaseLoader)
-        for doc in documents:
-            path = None
-            if _should_grep_modules(
-                doc['document'],
-                grep_only_modules_data,
-                grep_only_modules_defaults_data,
-            ):
-                name = f"{doc['data']['module']}.yaml"
-                path = os.path.join(module_defaults_path, name)
-                logging.info('Found %s module defaults', name)
-            elif _should_grep_defaults(
-                    doc['document'],
-                    grep_only_modules_data,
-                    grep_only_modules_defaults_data,
-            ):
-                # pungi.phases.pkgset.sources.source_koji.get_koji_modules
-                stream = doc['data']['stream'].replace('-', '_')
-                doc_data = doc['data']
-                name = f"{doc_data['name']}-{stream}-" \
-                       f"{doc_data['version']}.{doc_data['context']}"
-                arch_dir = os.path.join(
-                    modules_path,
-                    doc_data['arch']
-                )
-                os.makedirs(arch_dir, exist_ok=True)
-                path = os.path.join(
-                    arch_dir,
-                    name,
-                )
-                logging.info('Found module %s', name)
-
-                if 'artifacts' not in doc['data']:
-                    logging.warning(
-                        'RPM %s does not have explicit list of artifacts',
-                        name
-                    )
-            if path is not None:
-                with open(path, 'w') as f:
-                    yaml.dump(doc, f, default_flow_style=False)
-
-
-def cli_main():
-    parser = ArgumentParser()
-    content_type_group = parser.add_mutually_exclusive_group(required=False)
-    content_type_group.add_argument(
-        '--get-only-modules-data',
-        action='store_true',
-        help='Parse and get only modules data',
-    )
-    content_type_group.add_argument(
-        '--get-only-modules-defaults-data',
-        action='store_true',
-        help='Parse and get only modules_defaults data',
-    )
-    path_group = parser.add_mutually_exclusive_group(required=True)
-    path_group.add_argument(
-        '-p', '--path',
-        type=FileType('rb'), nargs='+',
-        help='Path to modules.yaml.gz file. '
-             'You may pass multiple files by passing -p path1 path2'
-    )
-    path_group.add_argument(
-        '-rp', '--repo-path',
-        required=False,
-        type=str,
-        default=None,
-        help='Path to a directory which contains repodirs. E.g. /var/repos'
-    )
-    path_group.add_argument(
-        '-rd', '--repodata-paths',
-        required=False,
-        type=str,
-        nargs='+',
-        default=[],
-        help='Paths/urls to the directories with directory `repodata`',
-    )
-    parser.add_argument('-t', '--target', required=True)
-
-    namespace = parser.parse_args()
-    if namespace.repodata_paths:
-        modules = []
-        for repodata_path in namespace.repodata_paths:
-            modules.append(read_modules_yaml_from_specific_repo(
-                repodata_path,
-            ))
-    elif namespace.path is not None:
-        modules = namespace.path
-    else:
-        modules = grep_list_of_modules_yaml(namespace.repo_path)
-    modules = list(filter(lambda i: i is not None, modules))
-    collect_modules(
-        modules,
-        namespace.target,
-        namespace.get_only_modules_data,
-        namespace.get_only_modules_defaults_data,
-    )
-
-
-if __name__ == '__main__':
-    cli_main()

pungi/scripts/gather_rpms.py

@@ -1,96 +0,0 @@
-import re
-from argparse import ArgumentParser
-
-import os
-from glob import iglob
-from typing import List
-from pathlib import Path
-
-from dataclasses import dataclass
-from productmd.common import parse_nvra
-
-
-@dataclass
-class Package:
-    nvra: dict
-    path: Path
-
-
-def search_rpms(top_dir: Path) -> List[Package]:
-    """
-    Search for all *.rpm files recursively
-    in given top directory
-    Returns:
-        list: list of paths
-    """
-    return [Package(
-        nvra=parse_nvra(Path(path).stem),
-        path=Path(path),
-    ) for path in iglob(str(top_dir.joinpath('**/*.rpm')), recursive=True)]
-
-
-def is_excluded_package(
-        package: Package,
-        excluded_packages: List[str],
-) -> bool:
-    package_key = f'{package.nvra["name"]}.{package.nvra["arch"]}'
-    return any(
-        re.search(
-            f'^{excluded_pkg}$',
-            package_key,
-        ) or excluded_pkg in (package.nvra['name'], package_key)
-        for excluded_pkg in excluded_packages
-    )
-
-
-def copy_rpms(
-        packages: List[Package],
-        target_top_dir: Path,
-        excluded_packages: List[str],
-):
-    """
-    Search synced repos for rpms and prepare
-    koji-like structure for pungi
-
-    Instead of repos, use following structure:
-        # ls /mnt/koji/
-            i686/  noarch/  x86_64/
-    Returns:
-        Nothing:
-    """
-    for package in packages:
-        if is_excluded_package(package, excluded_packages):
-            continue
-        target_arch_dir = target_top_dir.joinpath(package.nvra['arch'])
-        target_file = target_arch_dir.joinpath(package.path.name)
-        os.makedirs(target_arch_dir, exist_ok=True)
-
-        if not target_file.exists():
-            try:
-                os.link(package.path, target_file)
-            except OSError:
-                # hardlink failed, try symlinking
-                package.path.symlink_to(target_file)
-
-
-def cli_main():
-    parser = ArgumentParser()
-    parser.add_argument('-p', '--path', required=True, type=Path)
-    parser.add_argument('-t', '--target', required=True, type=Path)
-    parser.add_argument(
-        '-e',
-        '--excluded-packages',
-        required=False,
-        nargs='+',
-        type=str,
-        default=[],
-    )
-
-    namespace = parser.parse_args()
-
-    rpms = search_rpms(namespace.path)
-    copy_rpms(rpms, namespace.target, namespace.excluded_packages)
-
-
-if __name__ == '__main__':
-    cli_main()

pungi/scripts/pungi.py

@@ -0,0 +1,514 @@
+# 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/>.
+
+from __future__ import absolute_import
+from __future__ import print_function
+
+import os
+import selinux
+import sys
+
+from argparse import ArgumentParser, Action
+
+from pungi import get_full_version
+import pungi.gather
+import pungi.config
+import pungi.ks
+
+
+def get_arguments(config):
+    parser = ArgumentParser()
+
+    class SetConfig(Action):
+        def __call__(self, parser, namespace, value, option_string=None):
+            config.set("pungi", self.dest, value)
+
+    parser.add_argument("--version", action="version", version=get_full_version())
+
+    # Pulled in from config file to be cli options as part of pykickstart conversion
+    parser.add_argument(
+        "--name",
+        dest="family",
+        type=str,
+        action=SetConfig,
+        help='the name for your distribution (defaults to "Fedora"), DEPRECATED',
+    )
+    parser.add_argument(
+        "--family",
+        dest="family",
+        action=SetConfig,
+        help='the family name for your distribution (defaults to "Fedora")',
+    )
+    parser.add_argument(
+        "--ver",
+        dest="version",
+        action=SetConfig,
+        help="the version of your distribution (defaults to datestamp)",
+    )
+    parser.add_argument(
+        "--flavor",
+        dest="variant",
+        action=SetConfig,
+        help="the flavor of your distribution spin (optional), DEPRECATED",
+    )
+    parser.add_argument(
+        "--variant",
+        dest="variant",
+        action=SetConfig,
+        help="the variant of your distribution spin (optional)",
+    )
+    parser.add_argument(
+        "--destdir",
+        dest="destdir",
+        action=SetConfig,
+        help="destination directory (defaults to current directory)",
+    )
+    parser.add_argument(
+        "--cachedir",
+        dest="cachedir",
+        action=SetConfig,
+        help="package cache directory (defaults to /var/cache/pungi)",
+    )
+    parser.add_argument(
+        "--bugurl",
+        dest="bugurl",
+        action=SetConfig,
+        help="the url for your bug system (defaults to http://bugzilla.redhat.com)",
+    )
+    parser.add_argument(
+        "--selfhosting",
+        action="store_true",
+        dest="selfhosting",
+        help="build a self-hosting tree by following build dependencies (optional)",
+    )
+    parser.add_argument(
+        "--fulltree",
+        action="store_true",
+        dest="fulltree",
+        help="build a tree that includes all packages built from corresponding source rpms (optional)",  # noqa: E501
+    )
+    parser.add_argument(
+        "--nosource",
+        action="store_true",
+        dest="nosource",
+        help="disable gathering of source packages (optional)",
+    )
+    parser.add_argument(
+        "--nodebuginfo",
+        action="store_true",
+        dest="nodebuginfo",
+        help="disable gathering of debuginfo packages (optional)",
+    )
+    parser.add_argument(
+        "--nodownload",
+        action="store_true",
+        dest="nodownload",
+        help="disable downloading of packages. instead, print the package URLs (optional)",  # noqa: E501
+    )
+    parser.add_argument(
+        "--norelnotes",
+        action="store_true",
+        dest="norelnotes",
+        help="disable gathering of release notes (optional); DEPRECATED",
+    )
+    parser.add_argument(
+        "--nogreedy",
+        action="store_true",
+        dest="nogreedy",
+        help="disable pulling of all providers of package dependencies (optional)",
+    )
+    parser.add_argument(
+        "--nodeps",
+        action="store_false",
+        dest="resolve_deps",
+        default=True,
+        help="disable resolving dependencies",
+    )
+    parser.add_argument(
+        "--sourceisos",
+        default=False,
+        action="store_true",
+        dest="sourceisos",
+        help="Create the source isos (other arch runs must be done)",
+    )
+    parser.add_argument(
+        "--force",
+        default=False,
+        action="store_true",
+        help="Force reuse of an existing destination directory (will overwrite files)",
+    )
+    parser.add_argument(
+        "--isfinal",
+        default=False,
+        action="store_true",
+        help="Specify this is a GA tree, which causes betanag to be turned off during install",  # noqa: E501
+    )
+    parser.add_argument(
+        "--nohash",
+        default=False,
+        action="store_true",
+        help="disable hashing the Packages trees",
+    )
+    parser.add_argument(
+        "--full-archlist",
+        action="store_true",
+        help="Use the full arch list for x86_64 (include i686, i386, etc.)",
+    )
+    parser.add_argument("--arch", help="Override default (uname based) arch")
+    parser.add_argument(
+        "--greedy", metavar="METHOD", help="Greedy method; none, all, build"
+    )
+    parser.add_argument(
+        "--multilib",
+        action="append",
+        metavar="METHOD",
+        help="Multilib method; can be specified multiple times; recommended: devel, runtime",  # noqa: E501
+    )
+    parser.add_argument(
+        "--lookaside-repo",
+        action="append",
+        dest="lookaside_repos",
+        metavar="NAME",
+        help="Specify lookaside repo name(s) (packages will used for depsolving but not be included in the output)",  # noqa: E501
+    )
+    parser.add_argument(
+        "--workdirbase",
+        dest="workdirbase",
+        action=SetConfig,
+        help="base working directory (defaults to destdir + /work)",
+    )
+    parser.add_argument(
+        "--no-dvd",
+        default=False,
+        action="store_true",
+        dest="no_dvd",
+        help="Do not make a install DVD/CD only the netinstall image and the tree",
+    )
+    parser.add_argument("--lorax-conf", help="Path to lorax.conf file (optional)")
+    parser.add_argument(
+        "-i",
+        "--installpkgs",
+        default=[],
+        action="append",
+        metavar="STRING",
+        help="Package glob for lorax to install before runtime-install.tmpl runs. (may be listed multiple times)",  # noqa: E501
+    )
+    parser.add_argument(
+        "--multilibconf",
+        default=None,
+        action=SetConfig,
+        help="Path to multilib conf files. Default is /usr/share/pungi/multilib/",
+    )
+
+    parser.add_argument(
+        "-c",
+        "--config",
+        dest="config",
+        required=True,
+        help="Path to kickstart config file",
+    )
+    parser.add_argument(
+        "--all-stages",
+        action="store_true",
+        default=True,
+        dest="do_all",
+        help="Enable ALL stages",
+    )
+    parser.add_argument(
+        "-G",
+        action="store_true",
+        default=False,
+        dest="do_gather",
+        help="Flag to enable processing the Gather stage",
+    )
+    parser.add_argument(
+        "-C",
+        action="store_true",
+        default=False,
+        dest="do_createrepo",
+        help="Flag to enable processing the Createrepo stage",
+    )
+    parser.add_argument(
+        "-B",
+        action="store_true",
+        default=False,
+        dest="do_buildinstall",
+        help="Flag to enable processing the BuildInstall stage",
+    )
+    parser.add_argument(
+        "-I",
+        action="store_true",
+        default=False,
+        dest="do_createiso",
+        help="Flag to enable processing the CreateISO stage",
+    )
+    parser.add_argument(
+        "--relnotepkgs",
+        dest="relnotepkgs",
+        action=SetConfig,
+        help="Rpms which contain the release notes",
+    )
+    parser.add_argument(
+        "--relnotefilere",
+        dest="relnotefilere",
+        action=SetConfig,
+        help="Which files are the release notes -- GPL EULA",
+    )
+    parser.add_argument(
+        "--nomacboot",
+        action="store_true",
+        dest="nomacboot",
+        help="disable setting up macboot as no hfs support ",
+    )
+
+    parser.add_argument(
+        "--rootfs-size",
+        dest="rootfs_size",
+        action=SetConfig,
+        default=False,
+        help="Size of root filesystem in GiB. If not specified, use lorax default value",  # noqa: E501
+    )
+
+    parser.add_argument(
+        "--pungirc",
+        dest="pungirc",
+        default="~/.pungirc",
+        action=SetConfig,
+        help="Read pungi options from config file ",
+    )
+
+    opts = parser.parse_args()
+
+    if (
+        not config.get("pungi", "variant").isalnum()
+        and not config.get("pungi", "variant") == ""
+    ):
+        parser.error("Variant must be alphanumeric")
+
+    if (
+        opts.do_gather
+        or opts.do_createrepo
+        or opts.do_buildinstall
+        or opts.do_createiso
+    ):
+        opts.do_all = False
+
+    if opts.arch and (opts.do_all or opts.do_buildinstall):
+        parser.error("Cannot override arch while the BuildInstall stage is enabled")
+
+    # set the iso_basename.
+    if not config.get("pungi", "variant") == "":
+        config.set(
+            "pungi",
+            "iso_basename",
+            "%s-%s" % (config.get("pungi", "family"), config.get("pungi", "variant")),
+        )
+    else:
+        config.set("pungi", "iso_basename", config.get("pungi", "family"))
+
+    return opts
+
+
+def main():
+    config = pungi.config.Config()
+    opts = get_arguments(config)
+
+    # Read the config to create "new" defaults
+    # reparse command line options so they take precedence
+    config = pungi.config.Config(pungirc=opts.pungirc)
+    opts = get_arguments(config)
+
+    # You must be this high to ride if you're going to do root tasks
+    if os.geteuid() != 0 and (opts.do_all or opts.do_buildinstall):
+        print("You must run pungi as root", file=sys.stderr)
+        return 1
+
+    if opts.do_all or opts.do_buildinstall:
+        try:
+            enforcing = selinux.security_getenforce()
+        except Exception:
+            print("INFO: selinux disabled")
+            enforcing = False
+        if enforcing:
+            print(
+                "WARNING: SELinux is enforcing.  This may lead to a compose with selinux disabled."  # noqa: E501
+            )
+            print("Consider running with setenforce 0.")
+
+    # Set up the kickstart parser and pass in the kickstart file we were handed
+    ksparser = pungi.ks.get_ksparser(ks_path=opts.config)
+
+    if opts.sourceisos:
+        config.set("pungi", "arch", "source")
+
+    for part in ksparser.handler.partition.partitions:
+        if part.mountpoint == "iso":
+            config.set("pungi", "cdsize", str(part.size))
+
+    config.set("pungi", "force", str(opts.force))
+
+    if config.get("pungi", "workdirbase") == "/work":
+        config.set("pungi", "workdirbase", "%s/work" % config.get("pungi", "destdir"))
+    # Set up our directories
+    if not os.path.exists(config.get("pungi", "destdir")):
+        try:
+            os.makedirs(config.get("pungi", "destdir"))
+        except OSError:
+            print(
+                "Error: Cannot create destination dir %s"
+                % config.get("pungi", "destdir"),
+                file=sys.stderr,
+            )
+            sys.exit(1)
+    else:
+        print("Warning: Reusing existing destination directory.")
+
+    if not os.path.exists(config.get("pungi", "workdirbase")):
+        try:
+            os.makedirs(config.get("pungi", "workdirbase"))
+        except OSError:
+            print(
+                "Error: Cannot create working base dir %s"
+                % config.get("pungi", "workdirbase"),
+                file=sys.stderr,
+            )
+            sys.exit(1)
+    else:
+        print("Warning: Reusing existing working base directory.")
+
+    cachedir = config.get("pungi", "cachedir")
+
+    if not os.path.exists(cachedir):
+        try:
+            os.makedirs(cachedir)
+        except OSError:
+            print("Error: Cannot create cache dir %s" % cachedir, file=sys.stderr)
+            sys.exit(1)
+
+    # Set debuginfo flag
+    if opts.nodebuginfo:
+        config.set("pungi", "debuginfo", "False")
+    if opts.greedy:
+        config.set("pungi", "greedy", opts.greedy)
+    else:
+        # XXX: compatibility
+        if opts.nogreedy:
+            config.set("pungi", "greedy", "none")
+        else:
+            config.set("pungi", "greedy", "all")
+    config.set("pungi", "resolve_deps", str(bool(opts.resolve_deps)))
+    if opts.isfinal:
+        config.set("pungi", "isfinal", "True")
+    if opts.nohash:
+        config.set("pungi", "nohash", "True")
+    if opts.full_archlist:
+        config.set("pungi", "full_archlist", "True")
+    if opts.arch:
+        config.set("pungi", "arch", opts.arch)
+    if opts.multilib:
+        config.set("pungi", "multilib", " ".join(opts.multilib))
+    if opts.lookaside_repos:
+        config.set("pungi", "lookaside_repos", " ".join(opts.lookaside_repos))
+    if opts.no_dvd:
+        config.set("pungi", "no_dvd", "True")
+    if opts.nomacboot:
+        config.set("pungi", "nomacboot", "True")
+    config.set("pungi", "fulltree", str(bool(opts.fulltree)))
+    config.set("pungi", "selfhosting", str(bool(opts.selfhosting)))
+    config.set("pungi", "nosource", str(bool(opts.nosource)))
+    config.set("pungi", "nodebuginfo", str(bool(opts.nodebuginfo)))
+
+    if opts.lorax_conf:
+        config.set("lorax", "conf_file", opts.lorax_conf)
+    if opts.installpkgs:
+        config.set("lorax", "installpkgs", " ".join(opts.installpkgs))
+
+    # Actually do work.
+    mypungi = pungi.gather.Pungi(config, ksparser)
+
+    with mypungi.yumlock:
+        if not opts.sourceisos:
+            if opts.do_all or opts.do_gather or opts.do_buildinstall:
+                mypungi._inityum()  # initialize the yum object for things that need it
+            if opts.do_all or opts.do_gather:
+                mypungi.gather()
+                if opts.nodownload:
+                    for line in mypungi.list_packages():
+                        flags_str = ",".join(line["flags"])
+                        if flags_str:
+                            flags_str = "(%s)" % flags_str
+                        sys.stdout.write("RPM%s: %s\n" % (flags_str, line["path"]))
+                    sys.stdout.flush()
+                else:
+                    mypungi.downloadPackages()
+                mypungi.makeCompsFile()
+                if not opts.nodebuginfo:
+                    mypungi.getDebuginfoList()
+                    if opts.nodownload:
+                        for line in mypungi.list_debuginfo():
+                            flags_str = ",".join(line["flags"])
+                            if flags_str:
+                                flags_str = "(%s)" % flags_str
+                            sys.stdout.write(
+                                "DEBUGINFO%s: %s\n" % (flags_str, line["path"])
+                            )
+                        sys.stdout.flush()
+                    else:
+                        mypungi.downloadDebuginfo()
+                if not opts.nosource:
+                    if opts.nodownload:
+                        for line in mypungi.list_srpms():
+                            flags_str = ",".join(line["flags"])
+                            if flags_str:
+                                flags_str = "(%s)" % flags_str
+                            sys.stdout.write("SRPM%s: %s\n" % (flags_str, line["path"]))
+                        sys.stdout.flush()
+                    else:
+                        mypungi.downloadSRPMs()
+
+                print("RPM size:       %s MiB" % (mypungi.size_packages() / 1024**2))
+                if not opts.nodebuginfo:
+                    print(
+                        "DEBUGINFO size: %s MiB"
+                        % (mypungi.size_debuginfo() / 1024**2)
+                    )
+                if not opts.nosource:
+                    print("SRPM size:      %s MiB" % (mypungi.size_srpms() / 1024**2))
+
+    # Furthermore (but without the yumlock...)
+    if not opts.sourceisos:
+        if opts.do_all or opts.do_createrepo:
+            mypungi.doCreaterepo()
+
+        if opts.do_all or opts.do_buildinstall:
+            if not opts.norelnotes:
+                mypungi.doGetRelnotes()
+            mypungi.doBuildinstall()
+
+        if opts.do_all or opts.do_createiso:
+            mypungi.doCreateIsos()
+
+    # Do things slightly different for src.
+    if opts.sourceisos:
+        # we already have all the content gathered
+        mypungi.topdir = os.path.join(
+            config.get("pungi", "destdir"),
+            config.get("pungi", "version"),
+            config.get("pungi", "variant"),
+            "source",
+            "SRPMS",
+        )
+        mypungi.doCreaterepo(comps=False)
+        if opts.do_all or opts.do_createiso:
+            mypungi.doCreateIsos()
+
+    print("All done!")

pungi/scripts/pungi_gather.py

@@ -97,7 +97,6 @@ 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()

pungi/scripts/pungi_koji.py

@@ -11,19 +11,19 @@ import locale
 import logging
 import os
 import socket
-import shlex
 import signal
 import sys
 import traceback
 import shutil
 import subprocess
 
+from six.moves import shlex_quote
+
 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
-from pungi.otel import tracing
 
 
 # force C locales
@@ -252,15 +252,9 @@ def main():
         kobo.log.add_stderr_logger(logger)
 
     conf = util.load_config(opts.config)
-    compose_type = opts.compose_type or conf.get("compose_type", "production")
-    label = opts.label or conf.get("label")
-    if label:
-        try:
-            productmd.composeinfo.verify_label(label)
-        except ValueError as ex:
-            abort(str(ex))
 
-    if compose_type == "production" and not label and not opts.no_label:
+    compose_type = opts.compose_type or conf.get("compose_type", "production")
+    if compose_type == "production" and not opts.label and not opts.no_label:
         abort("must specify label for a production compose")
 
     if (
@@ -310,7 +304,7 @@ def main():
             opts.target_dir,
             conf,
             compose_type=compose_type,
-            compose_label=label,
+            compose_label=opts.label,
             parent_compose_ids=opts.parent_compose_id,
             respin_of=opts.respin_of,
         )
@@ -321,7 +315,7 @@ def main():
             ci = Compose.get_compose_info(
                 conf,
                 compose_type=compose_type,
-                compose_label=label,
+                compose_label=opts.label,
                 parent_compose_ids=opts.parent_compose_id,
                 respin_of=opts.respin_of,
             )
@@ -386,7 +380,7 @@ def run_compose(
     compose.log_info("User name: %s" % getpass.getuser())
     compose.log_info("Working directory: %s" % os.getcwd())
     compose.log_info(
-        "Command line: %s" % " ".join([shlex.quote(arg) for arg in sys.argv])
+        "Command line: %s" % " ".join([shlex_quote(arg) for arg in sys.argv])
     )
     compose.log_info("Compose top directory: %s" % compose.topdir)
     compose.log_info("Current timezone offset: %s" % pungi.util.get_tz_offset())
@@ -423,14 +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)
-    imagebuilder_phase = pungi.phases.ImageBuilderPhase(compose)
     osbs_phase = pungi.phases.OSBSPhase(compose, pkgset_phase, buildinstall_phase)
     image_container_phase = pungi.phases.ImageContainerPhase(compose)
     image_checksum_phase = pungi.phases.ImageChecksumPhase(compose)
@@ -446,19 +438,17 @@ 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,
-        imagebuilder_phase,
     ):
         if phase.skip():
             continue
@@ -473,6 +463,50 @@ 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()
 
@@ -484,58 +518,49 @@ def run_compose(
         buildinstall_phase,
         (gather_phase, createrepo_phase),
         extrafiles_phase,
-        ostree_phase,
+        (ostree_phase, ostree_installer_phase),
     )
     essentials_phase = pungi.phases.WeaverPhase(compose, essentials_schema)
     essentials_phase.start()
-    ostree_container_phase.start()
+    essentials_phase.stop()
-    try:
-        essentials_phase.stop()
 
-        # write treeinfo before ISOs are created
+    # write treeinfo before ISOs are created
-        for variant in compose.get_variants():
+    for variant in compose.get_variants():
-            for arch in variant.arches + ["src"]:
+        for arch in variant.arches + ["src"]:
-                pungi.metadata.write_tree_info(
+            pungi.metadata.write_tree_info(
-                    compose, arch, variant, bi=buildinstall_phase
+                compose, arch, variant, bi=buildinstall_phase
-                )
+            )
 
-        # write .discinfo and media.repo before ISOs are created
+    # write .discinfo and media.repo before ISOs are created
-        for variant in compose.get_variants():
+    for variant in compose.get_variants():
-            if variant.type == "addon" or variant.is_empty:
+        if variant.type == "addon" or variant.is_empty:
-                continue
+            continue
-            for arch in variant.arches + ["src"]:
+        for arch in variant.arches + ["src"]:
-                timestamp = pungi.metadata.write_discinfo(compose, arch, variant)
+            timestamp = pungi.metadata.write_discinfo(compose, arch, variant)
-                pungi.metadata.write_media_repo(compose, arch, variant, timestamp)
+            pungi.metadata.write_media_repo(compose, arch, variant, timestamp)
 
-        # Run phases for image artifacts in parallel
+    # Run phases for image artifacts in parallel
-        compose_images_schema = (
+    compose_images_schema = (
-            createiso_phase,
+        createiso_phase,
-            extra_isos_phase,
+        extra_isos_phase,
-            image_build_phase,
+        liveimages_phase,
-            livemedia_phase,
+        image_build_phase,
-            osbuild_phase,
+        livemedia_phase,
-            kiwibuild_phase,
+        osbuild_phase,
-            imagebuilder_phase,
+    )
-        )
+    post_image_phase = pungi.phases.WeaverPhase(
-        compose_images_phase = pungi.phases.WeaverPhase(compose, compose_images_schema)
+        compose, (image_checksum_phase, image_container_phase)
-        extra_phase_schema = (
+    )
-            (compose_images_phase, image_container_phase),
+    compose_images_phase = pungi.phases.WeaverPhase(compose, compose_images_schema)
-            ostree_installer_phase,
+    extra_phase_schema = (
-            osbs_phase,
+        (compose_images_phase, post_image_phase),
-            repoclosure_phase,
+        osbs_phase,
-        )
+        repoclosure_phase,
-        extra_phase = pungi.phases.WeaverPhase(compose, extra_phase_schema)
+    )
+    extra_phase = pungi.phases.WeaverPhase(compose, extra_phase_schema)
 
-        extra_phase.start()
+    extra_phase.start()
-        extra_phase.stop()
+    extra_phase.stop()
-    finally:
-        # wait for ostree container phase here too - it can happily run in parallel with
-        # all of the other stuff, but we must ensure it always gets stopped
-        ostree_container_phase.stop()
-
-    # now we do checksums as all images are done
-    image_checksum_phase.start()
-    image_checksum_phase.stop()
 
     pungi.metadata.write_compose_info(compose)
     if not (
@@ -543,12 +568,10 @@ 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 imagebuilder_phase.skip()
         and osbuild_phase.skip()
-        and ostree_container_phase.skip()
     ):
         compose.im.dump(compose.paths.compose.metadata("images.json"))
     compose.dump_containers_metadata()
@@ -657,28 +680,22 @@ def cli_main():
     signal.signal(signal.SIGINT, sigterm_handler)
     signal.signal(signal.SIGTERM, sigterm_handler)
 
-    tracing.setup()
+    try:
-
+        main()
-    with tracing.span("run-compose"):
+    except (Exception, KeyboardInterrupt) as ex:
-        try:
+        if COMPOSE:
-            main()
+            COMPOSE.log_error("Compose run failed: %s" % ex)
-        except (Exception, KeyboardInterrupt) as ex:
+            COMPOSE.traceback(show_locals=getattr(ex, "show_locals", True))
-            tracing.record_exception(ex)
+            COMPOSE.log_critical("Compose failed: %s" % COMPOSE.topdir)
-            if COMPOSE:
+            COMPOSE.write_status("DOOMED")
-                COMPOSE.log_error("Compose run failed: %s" % ex)
+        else:
-                COMPOSE.traceback(show_locals=getattr(ex, "show_locals", True))
+            print("Exception: %s" % ex)
-                COMPOSE.log_critical("Compose failed: %s" % COMPOSE.topdir)
+            raise
-                COMPOSE.write_status("DOOMED")
+        sys.stdout.flush()
-            else:
+        sys.stderr.flush()
-                print("Exception: %s" % ex)
+        sys.exit(1)
-                raise
+    finally:
-            sys.stdout.flush()
+        # Remove repositories cloned during ExtraFiles phase
-            sys.stderr.flush()
+        process_id = os.getpid()
-            sys.exit(1)
+        directoy_to_remove = "/tmp/pungi-temp-git-repos-" + str(process_id) + "/"
-        finally:
+        rmtree(directoy_to_remove)
-            # 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)
-    # Wait for all traces to be sent...
-    tracing.force_flush()

pungi/threading.py

@@ -1,21 +0,0 @@
-from kobo.threads import WorkerThread
-
-from .otel import tracing
-
-
-class TelemetryWorkerThread(WorkerThread):
-    """
-    Subclass of WorkerThread that captures current context when the thread is
-    created, and restores the context in the new thread.
-
-    A regular WorkerThread would start from an empty context, leading to any
-    spans created in the thread disconnected from the overall trace.
-    """
-
-    def __init__(self, *args, **kwargs):
-        self.traceparent = tracing.get_traceparent()
-        super(TelemetryWorkerThread, self).__init__(*args, **kwargs)
-
-    def run(self, *args, **kwargs):
-        tracing.set_context(self.traceparent)
-        super(TelemetryWorkerThread, self).run(*args, **kwargs)

pungi/util.py

@@ -19,24 +19,22 @@ import subprocess
 import os
 import shutil
 import string
+import sys
+import hashlib
 import errno
 import re
 import contextlib
-import shlex
 import traceback
 import tempfile
 import time
-import urllib.parse
-import urllib.request
 import functools
+from six.moves import urllib, range, shlex_quote
 
 import kobo.conf
 from kobo.shortcuts import run, force_list
-from kobo.threads import ThreadPool
+from kobo.threads import WorkerThread, ThreadPool
 from productmd.common import get_major_version
 from pungi.module_util import Modulemd
-from pungi.otel import tracing
-from pungi.threading import TelemetryWorkerThread as WorkerThread
 
 # Patterns that match all names of debuginfo packages
 DEBUG_PATTERNS = ["*-debuginfo", "*-debuginfo-*", "*-debugsource"]
@@ -45,6 +43,132 @@ DEBUG_PATTERN_RE = re.compile(
 )
 
 
+def _doRunCommand(
+    command,
+    logger,
+    rundir="/tmp",
+    output=subprocess.PIPE,
+    error=subprocess.PIPE,
+    env=None,
+):
+    """Run a command and log the output.  Error out if we get something on stderr"""
+
+    logger.info("Running %s" % subprocess.list2cmdline(command))
+
+    p1 = subprocess.Popen(
+        command,
+        cwd=rundir,
+        stdout=output,
+        stderr=error,
+        universal_newlines=True,
+        env=env,
+        close_fds=True,
+    )
+    (out, err) = p1.communicate()
+
+    if out:
+        logger.debug(out)
+
+    if p1.returncode != 0:
+        logger.error("Got an error from %s" % command[0])
+        logger.error(err)
+        raise OSError(
+            "Got an error (%d) from %s: %s" % (p1.returncode, command[0], err)
+        )
+
+
+def _link(local, target, logger, force=False):
+    """Simple function to link or copy a package, removing target optionally."""
+
+    if os.path.exists(target) and force:
+        os.remove(target)
+
+    # check for broken links
+    if force and os.path.islink(target):
+        if not os.path.exists(os.readlink(target)):
+            os.remove(target)
+
+    try:
+        os.link(local, target)
+    except OSError as e:
+        if e.errno != 18:  # EXDEV
+            logger.error("Got an error linking from cache: %s" % e)
+            raise OSError(e)
+
+        # Can't hardlink cross file systems
+        shutil.copy2(local, target)
+
+
+def _ensuredir(target, logger, force=False, clean=False):
+    """Ensure that a directory exists, if it already exists, only continue
+    if force is set."""
+
+    # We have to check existence of a logger, as setting the logger could
+    # itself cause an issue.
+    def whoops(func, path, exc_info):
+        message = "Could not remove %s" % path
+        if logger:
+            logger.error(message)
+        else:
+            sys.stderr(message)
+        sys.exit(1)
+
+    if os.path.exists(target) and not os.path.isdir(target):
+        message = "%s exists but is not a directory." % target
+        if logger:
+            logger.error(message)
+        else:
+            sys.stderr(message)
+        sys.exit(1)
+
+    if not os.path.isdir(target):
+        os.makedirs(target)
+    elif force and clean:
+        shutil.rmtree(target, onerror=whoops)
+        os.makedirs(target)
+    elif force:
+        return
+    else:
+        message = "Directory %s already exists.  Use --force to overwrite." % target
+        if logger:
+            logger.error(message)
+        else:
+            sys.stderr(message)
+        sys.exit(1)
+
+
+def _doCheckSum(path, hash, logger):
+    """Generate a checksum hash from a provided path.
+    Return a string of type:hash"""
+
+    # Try to figure out what hash we want to do
+    try:
+        sum = hashlib.new(hash)
+    except ValueError:
+        logger.error("Invalid hash type: %s" % hash)
+        return False
+
+    # Try to open the file, using binary flag.
+    try:
+        myfile = open(path, "rb")
+    except IOError as e:
+        logger.error("Could not open file %s: %s" % (path, e))
+        return False
+
+    # Loop through the file reading chunks at a time as to not
+    # put the entire file in memory.  That would suck for DVDs
+    while True:
+        chunk = myfile.read(
+            8192
+        )  # magic number!  Taking suggestions for better blocksize
+        if not chunk:
+            break  # we're done with the file
+        sum.update(chunk)
+    myfile.close()
+
+    return "%s:%s" % (hash, sum.hexdigest())
+
+
 def makedirs(path, mode=0o775):
     try:
         os.makedirs(path, mode=mode)
@@ -69,14 +193,14 @@ def explode_rpm_package(pkg_path, target_dir):
     try:
         # rpm2archive writes to stdout only if reading from stdin, thus the redirect
         run(
-            "rpm2archive - <%s | tar xfz - && chmod -R a+rX ." % shlex.quote(pkg_path),
+            "rpm2archive - <%s | tar xfz - && chmod -R a+rX ." % shlex_quote(pkg_path),
             workdir=target_dir,
         )
     except RuntimeError:
         # Fall back to rpm2cpio in case rpm2archive failed (most likely due to
         # not being present on the system).
         run(
-            "rpm2cpio %s | cpio -iuvmd && chmod -R a+rX ." % shlex.quote(pkg_path),
+            "rpm2cpio %s | cpio -iuvmd && chmod -R a+rX ." % shlex_quote(pkg_path),
             workdir=target_dir,
         )
 
@@ -250,38 +374,6 @@ class GitUrlResolver(object):
         return self.cache[key]
 
 
-class ContainerTagResolver(object):
-    """
-    A caching resolver for container image urls that replaces tags with digests.
-    """
-
-    def __init__(self, offline=False):
-        self.offline = offline
-        self.cache = {}
-
-    def __call__(self, url):
-        if self.offline:
-            # We're offline, nothing to do
-            return url
-        if re.match(".*@sha256:[a-z0-9]+", url):
-            # We already have a digest
-            return url
-        if url not in self.cache:
-            self.cache[url] = self._resolve(url)
-        return self.cache[url]
-
-    def _resolve(self, url):
-        m = re.match("^.+(:.+)$", url)
-        if not m:
-            raise RuntimeError("Failed to find tag name")
-        tag = m.group(1)
-
-        with tracing.span("skopeo-inspect", url=url):
-            data = _skopeo_inspect(url)
-        digest = data["Digest"]
-        return url.replace(tag, f"@{digest}")
-
-
 # format: {arch|*: [data]}
 def get_arch_data(conf, var_name, arch):
     result = []
@@ -395,7 +487,10 @@ def get_volid(compose, arch, variant=None, disc_type=False, formats=None, **kwar
         tried.add(volid)
 
     if volid and len(volid) > 32:
-        volid = volid[:32]
+        raise ValueError(
+            "Could not create volume ID longer than 32 bytes, options are %r",
+            sorted(tried, key=len),
+        )
 
     if compose.conf["restricted_volid"]:
         # Replace all non-alphanumeric characters and non-underscores) with
@@ -498,13 +593,7 @@ def failable(
     else:
         compose.require_deliverable(variant, arch, deliverable, subvariant)
     try:
-        with tracing.span(
+        yield
-            f"generate-{deliverable}",
-            variant=variant.uid,
-            arch=arch,
-            subvariant=subvariant or "",
-        ):
-            yield
     except Exception as exc:
         if not can_fail:
             raise
@@ -689,11 +778,7 @@ def run_unmount_cmd(cmd, max_retries=10, path=None, logger=None):
     """
     for i in range(max_retries):
         proc = subprocess.Popen(
-            cmd,
+            cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
-            text=True,
-            errors="replace",
         )
         out, err = proc.communicate()
         if proc.returncode == 0:
@@ -715,8 +800,7 @@ def run_unmount_cmd(cmd, max_retries=10, path=None, logger=None):
                     c,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.STDOUT,
-                    text=True,
+                    universal_newlines=True,
-                    errors="replace",
                 )
                 out, _ = proc.communicate()
                 logger.debug(
@@ -917,12 +1001,11 @@ def retry(timeout=120, interval=30, wait_on=Exception):
 
 @retry(wait_on=RuntimeError)
 def git_ls_remote(baseurl, ref, credential_helper=None):
-    with tracing.span("git-ls-remote", baseurl=baseurl, ref=ref):
+    cmd = ["git"]
-        cmd = ["git"]
+    if credential_helper:
-        if credential_helper:
+        cmd.extend(["-c", "credential.useHttpPath=true"])
-            cmd.extend(["-c", "credential.useHttpPath=true"])
+        cmd.extend(["-c", "credential.helper=%s" % credential_helper])
-            cmd.extend(["-c", "credential.helper=%s" % credential_helper])
+    return run(cmd + ["ls-remote", baseurl, ref], universal_newlines=True)
-        return run(cmd + ["ls-remote", baseurl, ref], text=True, errors="replace")
 
 
 def get_tz_offset():
@@ -1080,14 +1163,3 @@ def format_size(sz):
         unit += 1
 
     return "%.3g %sB" % (sz, UNITS[unit])
-
-
-@retry(interval=5, timeout=60, wait_on=RuntimeError)
-def _skopeo_inspect(url):
-    """Wrapper for running `skopeo inspect {url}` and parsing the output.
-    Retries on failure.
-    """
-    cp = subprocess.run(
-        ["skopeo", "inspect", url], stdout=subprocess.PIPE, check=True, encoding="utf-8"
-    )
-    return json.loads(cp.stdout)

pungi/wrappers/comps.py

@@ -306,8 +306,6 @@ class CompsWrapper(object):
             append_common_info(doc, group_node, group, force_description=True)
             append_bool(doc, group_node, "default", group.default)
             append_bool(doc, group_node, "uservisible", group.uservisible)
-            if group.display_order is not None:
-                append(doc, group_node, "display_order", str(group.display_order))
 
             if group.lang_only:
                 append(doc, group_node, "langonly", group.lang_only)

pungi/wrappers/fus.py

@@ -88,12 +88,5 @@ def parse_output(output):
                 packages.add((name, arch, frozenset(flags)))
             else:
                 name, arch = nevra.rsplit(".", 1)
-                # replace dash by underscore in stream of module's nerva
+                modules.add(name.split(":", 1)[1])
-                # source of name looks like
-                # module:llvm-toolset:rhel8:8040020210411062713:9f9e2e7e.x86_64
-                name = ':'.join(
-                    item.replace('-', '_') if i == 1 else item for
-                    i, item in enumerate(name.split(':')[1:])
-                )
-                modules.add(name)
     return packages, modules

pungi/wrappers/iso.py

@@ -15,9 +15,9 @@
 
 
 import os
-import shlex
 from fnmatch import fnmatch
 import contextlib
+from six.moves import shlex_quote
 
 from kobo.shortcuts import force_list, relative_path, run
 from pungi import util
@@ -227,7 +227,7 @@ def get_checkisomd5_cmd(iso_path, just_print=False):
 
 def get_checkisomd5_data(iso_path, logger=None):
     cmd = get_checkisomd5_cmd(iso_path, just_print=True)
-    retcode, output = run(cmd, text=True, errors="replace")
+    retcode, output = run(cmd, universal_newlines=True)
     items = [line.strip().rsplit(":", 1) for line in output.splitlines()]
     items = dict([(k, v.strip()) for k, v in items])
     md5 = items.get(iso_path, "")
@@ -270,31 +270,24 @@ def get_manifest_cmd(iso_name, xorriso=False, output_file=None):
             tr -d "'" |
             cut -c2- |
             sort >> %s""" % (
-            shlex.quote(iso_name),
+            shlex_quote(iso_name),
-            shlex.quote(output_file),
+            shlex_quote(output_file),
         )
     else:
         return "isoinfo -R -f -i %s | grep -v '/TRANS.TBL$' | sort >> %s" % (
-            shlex.quote(iso_name),
+            shlex_quote(iso_name),
-            shlex.quote(output_file),
+            shlex_quote(output_file),
         )
 
 
-def get_volume_id(path, xorriso=False):
+def get_volume_id(path):
-    if xorriso:
+    cmd = ["isoinfo", "-d", "-i", path]
-        cmd = ["xorriso", "-indev", path]
+    retcode, output = run(cmd, universal_newlines=True)
-        retcode, output = run(cmd, text=True, errors="replace")
-        for line in output.splitlines():
-            if line.startswith("Volume id"):
-                return line.split("'")[1]
-    else:
-        cmd = ["isoinfo", "-d", "-i", path]
-        retcode, output = run(cmd, text=True, errors="replace")
 
-        for line in output.splitlines():
+    for line in output.splitlines():
-            line = line.strip()
+        line = line.strip()
-            if line.startswith("Volume id:"):
+        if line.startswith("Volume id:"):
-                return line[11:].strip()
+            return line[11:].strip()
 
     raise RuntimeError("Could not read Volume ID")
 
@@ -500,7 +493,7 @@ def mount(image, logger=None, use_guestmount=True):
         else:
             env = {}
             cmd = ["mount", "-o", "loop", image, mount_dir]
-        ret, out = run(cmd, env=env, can_fail=True, text=True, errors="replace")
+        ret, out = run(cmd, env=env, can_fail=True, universal_newlines=True)
         if ret != 0:
             # The mount command failed, something is wrong.
             # Log the output and raise an exception.
@@ -516,21 +509,3 @@ 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

pungi/wrappers/kojimock.py

@@ -1,299 +0,0 @@
-import os
-import time
-from pathlib import Path
-
-from attr import dataclass
-from kobo.rpmlib import parse_nvra
-
-from pungi.module_util import Modulemd
-
-# just a random value which we don't
-# use in mock currently
-# originally builds are filtered by this value
-# to get consistent snapshot of tags and packages
-from pungi.scripts.gather_rpms import search_rpms
-
-LAST_EVENT_ID = 999999
-# last event time is not important but build
-# time should be less then it
-LAST_EVENT_TIME = time.time()
-BUILD_TIME = 0
-# virtual build that collects all
-# packages built for some arch
-RELEASE_BUILD_ID = 15270
-# tag that should have all packages available
-ALL_PACKAGES_TAG = 'dist-c8-compose'
-# tag that should have all modules available
-ALL_MODULES_TAG = 'dist-c8-module-compose'
-
-
-@dataclass
-class Module:
-    build_id: int
-    name: str
-    nvr: str
-    stream: str
-    version: str
-    context: str
-    arch: str
-
-
-class KojiMock:
-    """
-    Class that acts like real koji (for some needed methods)
-    but uses local storage as data source
-    """
-    def __init__(self, packages_dir, modules_dir, all_arches):
-        self._modules = self._gather_modules(modules_dir)
-        self._modules_dir = modules_dir
-        self._packages_dir = packages_dir
-        self._all_arches = all_arches
-
-    @staticmethod
-    def _gather_modules(modules_dir):
-        modules = {}
-        for index, (f, arch) in enumerate(
-            (sub_path.name, sub_path.parent.name)
-            for path in Path(modules_dir).glob('*')
-            for sub_path in path.iterdir()
-        ):
-            parsed = parse_nvra(f)
-            modules[index] = Module(
-                name=parsed['name'],
-                nvr=f,
-                version=parsed['release'],
-                context=parsed['arch'],
-                stream=parsed['version'],
-                build_id=index,
-                arch=arch,
-            )
-        return modules
-
-    @staticmethod
-    def getLastEvent(*args, **kwargs):
-        return {'id': LAST_EVENT_ID, 'ts': LAST_EVENT_TIME}
-
-    def listTagged(self, tag_name, *args, **kwargs):
-        """
-        Returns list of virtual 'builds' that contain packages by given tag
-        There are two kinds of tags: modular and distributive.
-        For now, only one kind, distributive one, is needed.
-        """
-        if tag_name != ALL_MODULES_TAG:
-            raise ValueError("I don't know what tag is %s" % tag_name)
-
-        builds = []
-        for module in self._modules.values():
-            builds.append({
-                'build_id': module.build_id,
-                'owner_name': 'centos',
-                'package_name': module.name,
-                'nvr': module.nvr,
-                'version': module.stream,
-                'release': '%s.%s' % (module.version, module.context),
-                'name': module.name,
-                'id': module.build_id,
-                'tag_name': tag_name,
-                'arch': module.arch,
-                # Following fields are currently not
-                # used but returned by real koji
-                # left them here just for reference
-                #
-                # 'task_id': None,
-                # 'state': 1,
-                # 'start_time': '2020-12-23 16:43:59',
-                # 'creation_event_id': 309485,
-                # 'creation_time': '2020-12-23 17:05:33.553748',
-                # 'epoch': None, 'tag_id': 533,
-                # 'completion_time': '2020-12-23 17:05:23',
-                # 'volume_id': 0,
-                # 'package_id': 3221,
-                # 'owner_id': 11,
-                # 'volume_name': 'DEFAULT',
-            })
-
-        return builds
-
-    @staticmethod
-    def getFullInheritance(*args, **kwargs):
-        """
-        Unneeded because we use local storage.
-        """
-        return []
-
-    def getBuild(self, build_id, *args, **kwargs):
-        """
-        Used to get information about build
-        (used in pungi only for modules currently)
-        """
-        module = self._modules[build_id]
-
-        result = {
-            'id': build_id,
-            'name': module.name,
-            'version': module.stream,
-            'release': '%s.%s' % (module.version, module.context),
-            'completion_ts': BUILD_TIME,
-            'state': 'COMPLETE',
-            'arch': module.arch,
-            'extra': {
-                'typeinfo': {
-                    'module': {
-                        'stream': module.stream,
-                        'version': module.version,
-                        'name': module.name,
-                        'context': module.context,
-                        'content_koji_tag': '-'.join([
-                            module.name,
-                            module.stream,
-                            module.version
-                        ]) + '.' + module.context
-                    }
-                }
-            }
-        }
-        return result
-
-    def listArchives(self, build_id, *args, **kwargs):
-        """
-        Originally lists artifacts for build, but in pungi used
-        only to get list of modulemd files for some module
-        """
-        module = self._modules[build_id]
-
-        return [
-            {
-                'build_id': module.build_id,
-                'filename': f'modulemd.{module.arch}.txt',
-                'btype': 'module'
-            },
-            # noone ever uses this file
-            # but it should be because pungi ignores builds
-            # with len(files) <= 1
-            {
-                'build_id': module.build_id,
-                'filename': 'modulemd.txt',
-                'btype': 'module'
-            }
-        ]
-
-    def listTaggedRPMS(self, tag_name, *args, **kwargs):
-        """
-        Get information about packages that are tagged by tag.
-        There are two kings of tags: per-module and per-distr.
-        """
-        if tag_name == ALL_PACKAGES_TAG:
-            builds, packages = self._get_release_packages()
-        else:
-            builds, packages = self._get_module_packages(tag_name)
-        return [
-            packages,
-            builds
-        ]
-
-    def _get_release_packages(self):
-        """
-        Search packages dir and keep only
-        packages that are non-modular.
-
-        This is quite the way how real koji works:
-         - modular packages are tagged by module-* tag
-         - all other packages are tagged with dist* tag
-        """
-        packages = []
-
-        # get all rpms in folder
-        rpms = search_rpms(Path(self._packages_dir))
-
-        for rpm in rpms:
-            info = parse_nvra(rpm.path.stem)
-            if 'module' in info['release']:
-                continue
-            packages.append({
-                "build_id": RELEASE_BUILD_ID,
-                "name": info['name'],
-                "extra": None,
-                "arch": info['arch'],
-                "epoch": info['epoch'] or None,
-                "version": info['version'],
-                "metadata_only": False,
-                "release": info['release'],
-                # not used currently
-                # "id": 262555,
-                # "size": 0
-            })
-        builds = []
-        return builds, packages
-
-    def _get_module_packages(self, tag_name):
-        """
-        Get list of builds for module and given module tag name.
-        """
-        builds = []
-        packages = []
-        modules = self._get_modules_by_name(tag_name)
-        for module in modules:
-            if module is None:
-                raise ValueError('Module %s is not found' % tag_name)
-            path = os.path.join(
-                self._modules_dir,
-                module.arch,
-                tag_name,
-            )
-
-            builds.append({
-                "build_id": module.build_id,
-                "package_name": module.name,
-                "nvr": module.nvr,
-                "tag_name": module.nvr,
-                "version": module.stream,
-                "release": module.version,
-                "id": module.build_id,
-                "name": module.name,
-                "volume_name": "DEFAULT",
-                # Following fields are currently not
-                # used but returned by real koji
-                # left them here just for reference
-                #
-                # "owner_name": "mbox-mbs-backend",
-                # "task_id": 195937,
-                # "state": 1,
-                # "start_time": "2020-12-22 19:20:12.504578",
-                # "creation_event_id": 306731,
-                # "creation_time": "2020-12-22 19:20:12.504578",
-                # "epoch": None,
-                # "tag_id": 1192,
-                # "completion_time": "2020-12-22 19:34:34.716615",
-                # "volume_id": 0,
-                # "package_id": 104,
-                # "owner_id": 6,
-            })
-
-            if os.path.exists(path):
-                info = Modulemd.ModuleStream.read_string(open(path).read(), strict=True)
-                for art in info.get_rpm_artifacts():
-                    data = parse_nvra(art)
-                    packages.append({
-                        "build_id": module.build_id,
-                        "name": data['name'],
-                        "extra": None,
-                        "arch": data['arch'],
-                        "epoch": data['epoch'] or None,
-                        "version": data['version'],
-                        "metadata_only": False,
-                        "release": data['release'],
-                        "id": 262555,
-                        "size": 0
-                    })
-            else:
-                raise RuntimeError('Unable to find module %s' % path)
-        return builds, packages
-
-    def _get_modules_by_name(self, tag_name):
-        modules = []
-        for arch in self._all_arches:
-            for module in self._modules.values():
-                if module.nvr != tag_name or module.arch != arch:
-                    continue
-                modules.append(module)
-        return modules

pungi/wrappers/kojiwrapper.py

@@ -14,27 +14,25 @@
 # along with this program; if not, see <https://gnu.org/licenses/>.
 
 
-import configparser
 import contextlib
 import os
 import re
 import socket
-import shlex
 import shutil
 import time
 import threading
-import xmlrpc.client
 
 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 .kojimock import KojiMock
 from .. import util
-from ..otel import tracing
 from ..arch_utils import getBaseArch
 
 
@@ -69,13 +67,13 @@ class KojiWrapper(object):
                 value = getattr(self.koji_module.config, key, None)
                 if value is not None:
                     session_opts[key] = value
-            self.koji_proxy = tracing.instrument_xmlrpc_proxy(
+            self.koji_proxy = koji.ClientSession(
-                koji.ClientSession(self.koji_module.config.server, session_opts)
+                self.koji_module.config.server, session_opts
             )
 
     # This retry should be removed once https://pagure.io/koji/issue/3170 is
     # fixed and released.
-    @util.retry(wait_on=(xmlrpc.client.ProtocolError, koji.GenericError))
+    @util.retry(wait_on=(xmlrpclib.ProtocolError, koji.GenericError))
     def login(self):
         """Authenticate to the hub."""
         auth_type = self.koji_module.config.authtype
@@ -146,7 +144,7 @@ class KojiWrapper(object):
         cmd.append(arch)
 
         if isinstance(command, list):
-            command = " ".join([shlex.quote(i) for i in command])
+            command = " ".join([shlex_quote(i) for i in command])
 
         # HACK: remove rpmdb and yum cache
         command = (
@@ -154,7 +152,7 @@ class KojiWrapper(object):
         )
 
         if chown_paths:
-            paths = " ".join(shlex.quote(pth) for pth in chown_paths)
+            paths = " ".join(shlex_quote(pth) for pth in chown_paths)
             command += " ; EXIT_CODE=$?"
             # Make the files world readable
             command += " ; chmod -R a+r %s" % paths
@@ -288,38 +286,35 @@ class KojiWrapper(object):
         :return dict: {"retcode": 0, "output": "", "task_id": 1}
         """
         task_id = None
-        with tracing.span("run-runroot-cmd", command=command):
+        with self.get_koji_cmd_env() as env:
-            with self.get_koji_cmd_env() as env:
+            retcode, output = run(
-                retcode, output = run(
+                command,
-                    command,
+                can_fail=True,
-                    can_fail=True,
+                logfile=log_file,
-                    logfile=log_file,
+                show_cmd=True,
-                    show_cmd=True,
+                env=env,
-                    env=env,
+                buffer_size=-1,
-                    buffer_size=-1,
+                universal_newlines=True,
-                    text=True,
+            )
-                    errors="replace",
-                )
 
-            # Look for first line that contains only a number. This is the ID of
+        # Look for first line that contains only a number. This is the ID of
-            # the new task. Usually this should be the first line, but there may be
+        # the new task. Usually this should be the first line, but there may be
-            # warnings before it.
+        # warnings before it.
-            for line in output.splitlines():
+        for line in output.splitlines():
-                match = re.search(r"^(\d+)$", line)
+            match = re.search(r"^(\d+)$", line)
-                if match:
+            if match:
-                    task_id = int(match.groups()[0])
+                task_id = int(match.groups()[0])
-                    break
+                break
 
-            if not task_id:
+        if not task_id:
-                raise RuntimeError(
+            raise RuntimeError(
-                    "Could not find task ID in output. Command '%s' returned '%s'."
+                "Could not find task ID in output. Command '%s' returned '%s'."
-                    % (" ".join(command), output)
+                % (" ".join(command), output)
-                )
+            )
 
-            self.save_task_id(task_id)
+        self.save_task_id(task_id)
-            tracing.set_attribute("task_id", task_id)
 
-            retcode, output = self._wait_for_task(task_id, logfile=log_file)
+        retcode, output = self._wait_for_task(task_id, logfile=log_file)
 
         return {
             "retcode": retcode,
@@ -363,7 +358,7 @@ class KojiWrapper(object):
             for option, value in opts.items():
                 if isinstance(value, list):
                     value = ",".join(value)
-                if not isinstance(value, str):
+                if not isinstance(value, six.string_types):
                     # Python 3 configparser will reject non-string values.
                     value = str(value)
                 cfg_parser.set(section, option, value)
@@ -418,6 +413,92 @@ 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)
@@ -434,10 +515,9 @@ class KojiWrapper(object):
         attempt = 0
 
         while True:
-            with tracing.span("watch-task", task_id=task_id):
+            retcode, output = run(
-                retcode, output = run(
+                cmd, can_fail=True, logfile=logfile, universal_newlines=True
-                    cmd, can_fail=True, logfile=logfile, text=True, errors="replace"
+            )
-                )
 
             if retcode == 0 or not (
                 self._has_connection_error(output) or self._has_offline_error(output)
@@ -461,36 +541,33 @@ class KojiWrapper(object):
         its exit code and parsed task id. This method will block until the
         command finishes.
         """
-        with tracing.span("run-blocking-cmd", command=command):
+        with self.get_koji_cmd_env() as env:
-            with self.get_koji_cmd_env() as env:
+            retcode, output = run(
-                retcode, output = run(
+                command,
-                    command,
+                can_fail=True,
-                    can_fail=True,
+                show_cmd=True,
-                    show_cmd=True,
+                logfile=log_file,
-                    logfile=log_file,
+                env=env,
-                    env=env,
+                buffer_size=-1,
-                    buffer_size=-1,
+                universal_newlines=True,
-                    text=True,
+            )
-                    errors="replace",
-                )
 
-            match = re.search(r"Created task: (\d+)", output)
+        match = re.search(r"Created task: (\d+)", output)
-            if not match:
+        if not match:
-                raise RuntimeError(
+            raise RuntimeError(
-                    "Could not find task ID in output. Command '%s' returned '%s'."
+                "Could not find task ID in output. Command '%s' returned '%s'."
-                    % (" ".join(command), output)
+                % (" ".join(command), output)
-                )
+            )
-            task_id = int(match.groups()[0])
+        task_id = int(match.groups()[0])
-            tracing.set_attribute("task_id", task_id)
 
-            self.save_task_id(task_id)
+        self.save_task_id(task_id)
 
-            if retcode != 0 and (
+        if retcode != 0 and (
-                self._has_connection_error(output) or self._has_offline_error(output)
+            self._has_connection_error(output) or self._has_offline_error(output)
-            ):
+        ):
-                retcode, output = self._wait_for_task(
+            retcode, output = self._wait_for_task(
-                    task_id, logfile=log_file, max_retries=max_retries
+                task_id, logfile=log_file, max_retries=max_retries
-                )
+            )
 
         return {
             "retcode": retcode,
@@ -535,8 +612,6 @@ class KojiWrapper(object):
                 "createImage",
                 "createLiveMedia",
                 "createAppliance",
-                "createKiwiImage",
-                "imageBuilderBuildArch",
             ]:
                 continue
 
@@ -572,6 +647,126 @@ class KojiWrapper(object):
 
         return result
 
+    def get_image_path(self, task_id):
+        result = []
+        task_info_list = []
+        task_info_list.append(self.koji_proxy.getTaskInfo(task_id, request=True))
+        task_info_list.extend(self.koji_proxy.getTaskChildren(task_id, request=True))
+
+        # scan parent and child tasks for certain methods
+        task_info = None
+        for i in task_info_list:
+            if i["method"] in ("createAppliance", "createLiveCD", "createImage"):
+                task_info = i
+                break
+
+        scratch = task_info["request"][-1].get("scratch", False)
+        task_result = self.koji_proxy.getTaskResult(task_info["id"])
+        task_result.pop("rpmlist", None)
+
+        if scratch:
+            topdir = os.path.join(
+                self.koji_module.pathinfo.work(),
+                self.koji_module.pathinfo.taskrelpath(task_info["id"]),
+            )
+        else:
+            build = self.koji_proxy.getImageBuild(
+                "%(name)s-%(version)s-%(release)s" % task_result
+            )
+            build["name"] = task_result["name"]
+            build["version"] = task_result["version"]
+            build["release"] = task_result["release"]
+            build["arch"] = task_result["arch"]
+            topdir = self.koji_module.pathinfo.imagebuild(build)
+        for i in task_result["files"]:
+            result.append(os.path.join(topdir, i))
+        return result
+
+    def get_wrapped_rpm_path(self, task_id, srpm=False):
+        result = []
+        task_info_list = []
+        task_info_list.extend(self.koji_proxy.getTaskChildren(task_id, request=True))
+
+        # scan parent and child tasks for certain methods
+        task_info = None
+        for i in task_info_list:
+            if i["method"] in ("wrapperRPM"):
+                task_info = i
+                break
+
+        # Get results of wrapperRPM task
+        # {'buildroot_id': 2479520,
+        #  'logs': ['checkout.log', 'root.log', 'state.log', 'build.log'],
+        #  'rpms': ['foreman-discovery-image-2.1.0-2.el7sat.noarch.rpm'],
+        #  'srpm': 'foreman-discovery-image-2.1.0-2.el7sat.src.rpm'}
+        task_result = self.koji_proxy.getTaskResult(task_info["id"])
+
+        # Get koji dir with results (rpms, srpms, logs, ...)
+        topdir = os.path.join(
+            self.koji_module.pathinfo.work(),
+            self.koji_module.pathinfo.taskrelpath(task_info["id"]),
+        )
+
+        # TODO: Maybe use different approach for non-scratch
+        # builds - see get_image_path()
+
+        # Get list of filenames that should be returned
+        result_files = task_result["rpms"]
+        if srpm:
+            result_files += [task_result["srpm"]]
+
+        # Prepare list with paths to the required files
+        for i in result_files:
+            result.append(os.path.join(topdir, i))
+
+        return result
+
+    def get_signed_wrapped_rpms_paths(self, task_id, sigkey, srpm=False):
+        result = []
+        parent_task = self.koji_proxy.getTaskInfo(task_id, request=True)
+        task_info_list = []
+        task_info_list.extend(self.koji_proxy.getTaskChildren(task_id, request=True))
+
+        # scan parent and child tasks for certain methods
+        task_info = None
+        for i in task_info_list:
+            if i["method"] in ("wrapperRPM"):
+                task_info = i
+                break
+
+        # Check parent_task if it's scratch build
+        scratch = parent_task["request"][-1].get("scratch", False)
+        if scratch:
+            raise RuntimeError("Scratch builds cannot be signed!")
+
+        # Get results of wrapperRPM task
+        # {'buildroot_id': 2479520,
+        #  'logs': ['checkout.log', 'root.log', 'state.log', 'build.log'],
+        #  'rpms': ['foreman-discovery-image-2.1.0-2.el7sat.noarch.rpm'],
+        #  'srpm': 'foreman-discovery-image-2.1.0-2.el7sat.src.rpm'}
+        task_result = self.koji_proxy.getTaskResult(task_info["id"])
+
+        # Get list of filenames that should be returned
+        result_files = task_result["rpms"]
+        if srpm:
+            result_files += [task_result["srpm"]]
+
+        # Prepare list with paths to the required files
+        for i in result_files:
+            rpminfo = self.koji_proxy.getRPM(i)
+            build = self.koji_proxy.getBuild(rpminfo["build_id"])
+            path = os.path.join(
+                self.koji_module.pathinfo.build(build),
+                self.koji_module.pathinfo.signed(rpminfo, sigkey),
+            )
+            result.append(path)
+
+        return result
+
+    def get_build_nvrs(self, task_id):
+        builds = self.koji_proxy.listBuilds(taskID=task_id)
+        return [build.get("nvr") for build in builds if build.get("nvr")]
+
     def multicall_map(
         self, koji_session, koji_session_fnc, list_of_args=None, list_of_kwargs=None
     ):
@@ -654,11 +849,11 @@ class KojiWrapper(object):
 
         return results
 
-    @util.retry(wait_on=(xmlrpc.client.ProtocolError, koji.GenericError))
+    @util.retry(wait_on=(xmlrpclib.ProtocolError, koji.GenericError))
     def retrying_multicall_map(self, *args, **kwargs):
         """
         Retrying version of multicall_map. This tries to retry the Koji call
-        in case of koji.GenericError or xmlrpc.client.ProtocolError.
+        in case of koji.GenericError or xmlrpclib.ProtocolError.
 
         Please refer to koji_multicall_map for further specification of arguments.
         """
@@ -674,45 +869,6 @@ class KojiWrapper(object):
             pass
 
 
-class KojiMockWrapper(object):
-    lock = threading.Lock()
-
-    def __init__(self, compose, all_arches):
-        self.all_arches = all_arches
-        self.compose = compose
-        try:
-            self.profile = self.compose.conf["koji_profile"]
-        except KeyError:
-            raise RuntimeError("Koji profile must be configured")
-        with self.lock:
-            self.koji_module = koji.get_profile_module(self.profile)
-            session_opts = {}
-            for key in (
-                "timeout",
-                "keepalive",
-                "max_retries",
-                "retry_interval",
-                "anon_retry",
-                "offline_retry",
-                "offline_retry_interval",
-                "debug",
-                "debug_xmlrpc",
-                "serverca",
-                "use_fast_upload",
-            ):
-                value = getattr(self.koji_module.config, key, None)
-                if value is not None:
-                    session_opts[key] = value
-            self.koji_proxy = KojiMock(
-                packages_dir=self.koji_module.config.topdir,
-                modules_dir=os.path.join(
-                    self.koji_module.config.topdir,
-                    'modules',
-                ),
-                all_arches=self.all_arches,
-            )
-
-
 def get_buildroot_rpms(compose, task_id):
     """Get build root RPMs - either from runroot or local"""
     result = []
@@ -737,8 +893,7 @@ def get_buildroot_rpms(compose, task_id):
         # local
         retcode, output = run(
             "rpm -qa --qf='%{name}-%{version}-%{release}.%{arch}\n'",
-            text=True,
+            universal_newlines=True,
-            errors="replace",
         )
         for i in output.splitlines():
             if not i:
@@ -804,8 +959,7 @@ class KojiDownloadProxy:
         :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 self.session.get(url, stream=True) as r:
-        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
@@ -898,8 +1052,7 @@ class KojiDownloadProxy:
                 os.utime(destination_file)
                 return destination_file
 
-            with tracing.span("download-rpm", url=url):
+            return self._atomic_download(url, destination_file, validator)
-                return self._atomic_download(url, destination_file, validator)
 
     def get_file(self, path, validator=None):
         """

pungi/wrappers/lorax.py

@@ -46,7 +46,6 @@ class LoraxWrapper(object):
         skip_branding=False,
         squashfs_only=False,
         configuration_file=None,
-        rootfs_type=None,
     ):
         cmd = ["lorax"]
         cmd.append("--product=%s" % product)
@@ -107,9 +106,6 @@ class LoraxWrapper(object):
         output_dir = os.path.abspath(output_dir)
         cmd.append(output_dir)
 
-        if rootfs_type:
-            cmd.append("--rootfs-type=%s" % rootfs_type)
-
         # TODO: workdir
 
         return cmd

pungi/wrappers/pungi.py

@@ -105,6 +105,85 @@ class PungiWrapper(object):
 
         kickstart.close()
 
+    def get_pungi_cmd(
+        self,
+        config,
+        destdir,
+        name,
+        version=None,
+        flavor=None,
+        selfhosting=False,
+        fulltree=False,
+        greedy=None,
+        nodeps=False,
+        nodownload=True,
+        full_archlist=False,
+        arch=None,
+        cache_dir=None,
+        lookaside_repos=None,
+        multilib_methods=None,
+        profiler=False,
+    ):
+        cmd = ["pungi"]
+
+        # Gather stage
+        cmd.append("-G")
+
+        # path to a kickstart file
+        cmd.append("--config=%s" % config)
+
+        # destdir is optional in Pungi (defaults to current dir), but
+        # want it mandatory here
+        cmd.append("--destdir=%s" % destdir)
+
+        # name
+        cmd.append("--name=%s" % name)
+
+        # version; optional, defaults to datestamp
+        if version:
+            cmd.append("--ver=%s" % version)
+
+        # rhel variant; optional
+        if flavor:
+            cmd.append("--flavor=%s" % flavor)
+
+        # turn selfhosting on
+        if selfhosting:
+            cmd.append("--selfhosting")
+
+        # NPLB
+        if fulltree:
+            cmd.append("--fulltree")
+
+        greedy = greedy or "none"
+        cmd.append("--greedy=%s" % greedy)
+
+        if nodeps:
+            cmd.append("--nodeps")
+
+        # don't download packages, just print paths
+        if nodownload:
+            cmd.append("--nodownload")
+
+        if full_archlist:
+            cmd.append("--full-archlist")
+
+        if arch:
+            cmd.append("--arch=%s" % arch)
+
+        if multilib_methods:
+            for i in multilib_methods:
+                cmd.append("--multilib=%s" % i)
+
+        if cache_dir:
+            cmd.append("--cachedir=%s" % cache_dir)
+
+        if lookaside_repos:
+            for i in lookaside_repos:
+                cmd.append("--lookaside-repo=%s" % i)
+
+        return cmd
+
     def get_pungi_cmd_dnf(
         self,
         config,
@@ -190,3 +269,70 @@ class PungiWrapper(object):
                 broken_deps.setdefault(match.group(2), set()).add(match.group(1))
 
         return packages, broken_deps, missing_comps
+
+    def run_pungi(
+        self,
+        ks_file,
+        destdir,
+        name,
+        selfhosting=False,
+        fulltree=False,
+        greedy="",
+        cache_dir=None,
+        arch="",
+        multilib_methods=[],
+        nodeps=False,
+        lookaside_repos=[],
+    ):
+        """
+        This is a replacement for get_pungi_cmd that runs it in-process. Not
+        all arguments are supported.
+        """
+        from .. import ks, gather, config
+
+        ksparser = ks.get_ksparser(ks_path=ks_file)
+        cfg = config.Config()
+        cfg.set("pungi", "destdir", destdir)
+        cfg.set("pungi", "family", name)
+        cfg.set("pungi", "iso_basename", name)
+        cfg.set("pungi", "fulltree", str(fulltree))
+        cfg.set("pungi", "selfhosting", str(selfhosting))
+        cfg.set("pungi", "cachedir", cache_dir)
+        cfg.set("pungi", "full_archlist", "True")
+        cfg.set("pungi", "workdirbase", "%s/work" % destdir)
+        cfg.set("pungi", "greedy", greedy)
+        cfg.set("pungi", "nosource", "False")
+        cfg.set("pungi", "nodebuginfo", "False")
+        cfg.set("pungi", "force", "False")
+        cfg.set("pungi", "resolve_deps", str(not nodeps))
+        if arch:
+            cfg.set("pungi", "arch", arch)
+        if multilib_methods:
+            cfg.set("pungi", "multilib", " ".join(multilib_methods))
+        if lookaside_repos:
+            cfg.set("pungi", "lookaside_repos", " ".join(lookaside_repos))
+
+        mypungi = gather.Pungi(cfg, ksparser)
+
+        with open(os.path.join(destdir, "out"), "w") as f:
+            with mypungi.yumlock:
+                mypungi._inityum()
+                mypungi.gather()
+
+                for line in mypungi.list_packages():
+                    flags_str = ",".join(line["flags"])
+                    if flags_str:
+                        flags_str = "(%s)" % flags_str
+                    f.write("RPM%s: %s\n" % (flags_str, line["path"]))
+                mypungi.makeCompsFile()
+                mypungi.getDebuginfoList()
+                for line in mypungi.list_debuginfo():
+                    flags_str = ",".join(line["flags"])
+                    if flags_str:
+                        flags_str = "(%s)" % flags_str
+                    f.write("DEBUGINFO%s: %s\n" % (flags_str, line["path"]))
+                for line in mypungi.list_srpms():
+                    flags_str = ",".join(line["flags"])
+                    if flags_str:
+                        flags_str = "(%s)" % flags_str
+                    f.write("SRPM%s: %s\n" % (flags_str, line["path"]))

pungi/wrappers/repoclosure.py

@@ -19,8 +19,13 @@ import os
 from kobo.shortcuts import force_list
 
 
-def get_repoclosure_cmd(backend="dnf", arch=None, repos=None, lookaside=None):
+def get_repoclosure_cmd(backend="yum", arch=None, repos=None, lookaside=None):
     cmds = {
+        "yum": {
+            "cmd": ["/usr/bin/repoclosure", "--tempcache"],
+            "repoarg": "--repoid=%s",
+            "lookaside": "--lookaside=%s",
+        },
         "dnf": {
             "cmd": ["dnf", "repoclosure"],
             "repoarg": "--repo=%s",
@@ -39,17 +44,18 @@ def get_repoclosure_cmd(backend="dnf", arch=None, repos=None, lookaside=None):
     for i in arches:
         cmd.append("--arch=%s" % i)
 
-    if arches:
+    if backend == "dnf" and arches:
         cmd.append("--forcearch=%s" % arches[0])
 
     repos = repos or {}
     for repo_id, repo_path in repos.items():
         cmd.append("--repofrompath=%s,%s" % (repo_id, _to_url(repo_path)))
         cmd.append(cmds[backend]["repoarg"] % repo_id)
-        # For dnf we want to add all repos with the --repo option (which
+        if backend == "dnf":
-        # enables only those and not any system repo), and the repos to
+            # For dnf we want to add all repos with the --repo option (which
-        # check are also listed with the --check option.
+            # enables only those and not any system repo), and the repos to
-        cmd.append("--check=%s" % repo_id)
+            # check are also listed with the --check option.
+            cmd.append("--check=%s" % repo_id)
 
     lookaside = lookaside or {}
     for repo_id, repo_path in lookaside.items():

pungi/wrappers/scm.py

@@ -19,16 +19,16 @@ from __future__ import absolute_import
 import os
 import shutil
 import glob
-import shlex
+import six
 import threading
-from urllib.request import urlretrieve
+from six.moves import shlex_quote
+from six.moves.urllib.request import urlretrieve
 from fnmatch import fnmatch
 
 import kobo.log
 from kobo.shortcuts import run, force_list
 from pungi.util import explode_rpm_package, makedirs, copy_all, temp_dir, retry
 from .kojiwrapper import KojiWrapper
-from ..otel import tracing
 
 lock = threading.Lock()
 
@@ -57,8 +57,7 @@ class ScmBase(kobo.log.LoggingBase):
                 workdir=cwd,
                 can_fail=True,
                 stdin_data="",
-                text=True,
+                universal_newlines=True,
-                errors="replace",
             )
             if retcode != 0:
                 self.log_error("Output was: %r" % output)
@@ -80,7 +79,7 @@ class FileWrapper(ScmBase):
         for i in dirs:
             copy_all(i, target_dir)
 
-    def export_file(self, scm_root, scm_file, target_dir, scm_branch=None, arch=None):
+    def export_file(self, scm_root, scm_file, target_dir, scm_branch=None):
         if scm_root:
             raise ValueError("FileWrapper: 'scm_root' should be empty.")
         self.log_debug(
@@ -119,7 +118,7 @@ class CvsWrapper(ScmBase):
             )
             copy_all(os.path.join(tmp_dir, scm_dir), target_dir)
 
-    def export_file(self, scm_root, scm_file, target_dir, scm_branch=None, arch=None):
+    def export_file(self, scm_root, scm_file, target_dir, scm_branch=None):
         scm_file = scm_file.lstrip("/")
         scm_branch = scm_branch or "HEAD"
         with temp_dir() as tmp_dir:
@@ -161,9 +160,6 @@ class GitWrapper(ScmBase):
         if "://" not in repo:
             repo = "file://%s" % repo
 
-        if repo.startswith("git+http"):
-            repo = repo[4:]
-
         git_cmd = ["git"]
         if "credential_helper" in self.options:
             git_cmd.extend(["-c", "credential.useHttpPath=true"])
@@ -202,17 +198,6 @@ class GitWrapper(ScmBase):
                     copy_all(destdir, debugdir)
                 raise
 
-        if os.path.exists(os.path.join(destdir, ".gitmodules")):
-            try:
-                self.log_debug("Cloning submodules")
-                run(["git", "submodule", "init"], workdir=destdir)
-                run(["git", "submodule", "update"], workdir=destdir)
-            except RuntimeError as e:
-                self.log_error(
-                    "Failed to clone submodules: %s %s", e, getattr(e, "output", "")
-                )
-                # Ignore the error here, there may just be no submodules.
-
     def get_temp_repo_path(self, scm_root, scm_branch):
         scm_repo = scm_root.split("/")[-1]
         process_id = os.getpid()
@@ -230,8 +215,7 @@ class GitWrapper(ScmBase):
         tmp_dir = self.get_temp_repo_path(scm_root, scm_branch)
         if not os.path.isdir(tmp_dir):
             makedirs(tmp_dir)
-            with tracing.span("git-clone", repo=scm_root, ref=scm_branch):
+            self._clone(scm_root, scm_branch, tmp_dir)
-                self._clone(scm_root, scm_branch, tmp_dir)
         self.run_process_command(tmp_dir)
         return tmp_dir
 
@@ -249,7 +233,7 @@ class GitWrapper(ScmBase):
 
             copy_all(os.path.join(tmp_dir, scm_dir), target_dir)
 
-    def export_file(self, scm_root, scm_file, target_dir, scm_branch=None, arch=None):
+    def export_file(self, scm_root, scm_file, target_dir, scm_branch=None):
         scm_file = scm_file.lstrip("/")
         scm_branch = scm_branch or "master"
 
@@ -290,12 +274,12 @@ class RpmScmWrapper(ScmBase):
                     run(
                         "cp -a %s %s/"
                         % (
-                            shlex.quote(os.path.join(tmp_dir, scm_dir)),
+                            shlex_quote(os.path.join(tmp_dir, scm_dir)),
-                            shlex.quote(target_dir),
+                            shlex_quote(target_dir),
                         )
                     )
 
-    def export_file(self, scm_root, scm_file, target_dir, scm_branch=None, arch=None):
+    def export_file(self, scm_root, scm_file, target_dir, scm_branch=None):
         for rpm in self._list_rpms(scm_root):
             scm_file = scm_file.lstrip("/")
             with temp_dir() as tmp_dir:
@@ -320,7 +304,7 @@ class KojiScmWrapper(ScmBase):
     def export_dir(self, *args, **kwargs):
         raise RuntimeError("Only files can be exported from Koji")
 
-    def export_file(self, scm_root, scm_file, target_dir, scm_branch=None, arch=None):
+    def export_file(self, scm_root, scm_file, target_dir, scm_branch=None):
         if scm_branch:
             self._get_latest_from_tag(scm_branch, scm_root, scm_file, target_dir)
         else:
@@ -357,44 +341,6 @@ class KojiScmWrapper(ScmBase):
             urlretrieve(url, target_file)
 
 
-class SkopeoCopyTimeoutError(RuntimeError):
-    pass
-
-
-class ContainerImageScmWrapper(ScmBase):
-
-    def export_dir(self, *args, **kwargs):
-        raise RuntimeError("Containers can only be exported as files")
-
-    def export_file(self, scm_root, scm_file, target_dir, scm_branch=None, arch=None):
-        if arch == "src":
-            return
-        ARCHES = {"aarch64": "arm64", "x86_64": "amd64"}
-        arch = ARCHES.get(arch, arch)
-        cmd = [
-            "skopeo",
-            "--override-arch=" + arch,
-            "copy",
-            scm_root,
-            "oci:" + target_dir,
-            "--remove-signatures",
-        ]
-        try:
-            self.log_debug(
-                "Exporting container %s to %s: %s", scm_root, target_dir, cmd
-            )
-            with tracing.span("skopeo-copy", arch=arch, image=scm_root):
-                self.retry_run(cmd, can_fail=False)
-        except RuntimeError as e:
-            output = getattr(e, "output", "")
-            self.log_error("Failed to copy container image: %s %s", e, output)
-
-            if "connection timed out" in output:
-                raise SkopeoCopyTimeoutError(output) from e
-
-            raise
-
-
 def _get_wrapper(scm_type, *args, **kwargs):
     SCM_WRAPPERS = {
         "file": FileWrapper,
@@ -402,7 +348,6 @@ def _get_wrapper(scm_type, *args, **kwargs):
         "git": GitWrapper,
         "rpm": RpmScmWrapper,
         "koji": KojiScmWrapper,
-        "container-image": ContainerImageScmWrapper,
     }
     try:
         cls = SCM_WRAPPERS[scm_type]
@@ -411,7 +356,7 @@ def _get_wrapper(scm_type, *args, **kwargs):
     return cls(*args, **kwargs)
 
 
-def get_file_from_scm(scm_dict, target_path, compose=None, arch=None):
+def get_file_from_scm(scm_dict, target_path, compose=None):
     """
     Copy one or more files from source control to a target path. A list of files
     created in ``target_path`` is returned.
@@ -442,7 +387,7 @@ def get_file_from_scm(scm_dict, target_path, compose=None, arch=None):
         >>> get_file_from_scm(scm_dict, target_path)
         ['/tmp/path/share/variants.dtd']
     """
-    if isinstance(scm_dict, str):
+    if isinstance(scm_dict, six.string_types):
         scm_type = "file"
         scm_repo = None
         scm_file = os.path.abspath(scm_dict)
@@ -465,18 +410,8 @@ def get_file_from_scm(scm_dict, target_path, compose=None, arch=None):
     files_copied = []
     for i in force_list(scm_file):
         with temp_dir(prefix="scm_checkout_") as tmp_dir:
-            # Most SCM wrappers need a temporary directory: the git repo is
+            scm.export_file(scm_repo, i, scm_branch=scm_branch, target_dir=tmp_dir)
-            # cloned there, and only relevant files are copied out. But this
+            files_copied += copy_all(tmp_dir, target_path)
-            # doesn't work for the container image fetching. That pulls in only
-            # required files, and the final output needs to be done by skopeo
-            # to correctly handle multiple containers landing in the same OCI
-            # archive.
-            dest = target_path if scm_type == "container-image" else tmp_dir
-            scm.export_file(
-                scm_repo, i, scm_branch=scm_branch, target_dir=dest, arch=arch
-            )
-            if dest == tmp_dir:
-                files_copied += copy_all(tmp_dir, target_path)
     return files_copied
 
 
@@ -515,7 +450,7 @@ def get_file(source, destination, compose, overwrite=False):
     return destination
 
 
-def get_dir_from_scm(scm_dict, target_path, compose=None, arch=None):
+def get_dir_from_scm(scm_dict, target_path, compose=None):
     """
     Copy a directory from source control to a target path. A list of files
     created in ``target_path`` is returned.
@@ -545,7 +480,7 @@ def get_dir_from_scm(scm_dict, target_path, compose=None, arch=None):
         >>> get_dir_from_scm(scm_dict, target_path)
         ['/tmp/path/share/variants.dtd', '/tmp/path/share/rawhide-fedora.ks', ...]
     """
-    if isinstance(scm_dict, str):
+    if isinstance(scm_dict, six.string_types):
         scm_type = "file"
         scm_repo = None
         scm_dir = os.path.abspath(scm_dict)

pungi_utils/patch_iso.py

@@ -15,8 +15,8 @@
 from kobo import shortcuts
 import os
 import productmd
-import shlex
 import tempfile
+from six.moves import shlex_quote
 
 from pungi import util
 from pungi.phases.buildinstall import tweak_configs
@@ -24,8 +24,8 @@ from pungi.wrappers import iso
 
 
 def sh(log, cmd, *args, **kwargs):
-    log.info("Running: %s", " ".join(shlex.quote(x) for x in cmd))
+    log.info("Running: %s", " ".join(shlex_quote(x) for x in cmd))
-    ret, out = shortcuts.run(cmd, *args, text=True, errors="replace", **kwargs)
+    ret, out = shortcuts.run(cmd, *args, universal_newlines=True, **kwargs)
     if out:
         log.debug("%s", out)
     return ret, out
@@ -35,8 +35,7 @@ def get_lorax_dir(default="/usr/share/lorax"):
     try:
         _, out = shortcuts.run(
             ["python3", "-c" "import pylorax; print(pylorax.find_templates())"],
-            text=True,
+            universal_newlines=True,
-            errors="replace",
         )
         return out.strip()
     except Exception:

pungi_utils/unified_isos.py

@@ -148,15 +148,6 @@ 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:
@@ -394,8 +385,7 @@ class UnifiedISO(object):
                 iso.get_mkisofs_cmd(
                     iso_path, [source_dir], volid=volid, exclude=["./lost+found"]
                 ),
-                text=True,
+                universal_newlines=True,
-                errors="replace",
             )
 
             # implant MD5

requirements.txt

@@ -1,6 +1,9 @@
 # Some packages must be installed via dnf/yum first, see doc/contributing.rst
+dict.sorted
 dogpile.cache
-flufl.lock
+flufl.lock ; python_version >= '3.0'
+flufl.lock < 3.0 ; python_version <= '2.7'
+funcsigs
 jsonschema
 kobo
 koji
@@ -11,3 +14,4 @@ ordered_set
 productmd
 pykickstart
 python-multilib
+urlgrabber

setup.py

@@ -20,7 +20,7 @@ packages = sorted(packages)
 
 setup(
     name="pungi",
-    version="4.10.1",
+    version="4.5.1",
     description="Distribution compose tool",
     url="https://pagure.io/pungi",
     author="Dennis Gilmore",
@@ -30,6 +30,7 @@ setup(
     entry_points={
         "console_scripts": [
             "comps_filter = pungi.scripts.comps_filter:main",
+            "pungi = pungi.scripts.pungi:main",
             "pungi-create-unified-isos = pungi.scripts.create_unified_isos:main",
             "pungi-fedmsg-notification = pungi.scripts.fedmsg_notification:main",
             "pungi-patch-iso = pungi.scripts.patch_iso:cli_main",
@@ -41,27 +42,25 @@ setup(
             "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",
-            "pungi-gather-modules = pungi.scripts.gather_modules:cli_main",
-            "pungi-gather-rpms = pungi.scripts.gather_rpms:cli_main",
-            "pungi-generate-packages-json = pungi.scripts.create_packages_json:cli_main",  # noqa: E501
-            "pungi-create-extra-repo = pungi.scripts.create_extra_repo:cli_main"
         ]
     },
     scripts=["contrib/yum-dnf-compare/pungi-compare-depsolving"],
     data_files=[
-        ("lib/tmpfiles.d", glob.glob("contrib/tmpfiles.d/*.conf")),
+        ("/usr/lib/tmpfiles.d", glob.glob("contrib/tmpfiles.d/*.conf")),
-        ("share/pungi", glob.glob("share/*.xsl")),
+        ("/usr/share/pungi", glob.glob("share/*.xsl")),
-        ("share/pungi", glob.glob("share/*.ks")),
+        ("/usr/share/pungi", glob.glob("share/*.ks")),
-        ("share/pungi", glob.glob("share/*.dtd")),
+        ("/usr/share/pungi", glob.glob("share/*.dtd")),
-        ("share/pungi/multilib", glob.glob("share/multilib/*")),
+        ("/usr/share/pungi/multilib", glob.glob("share/multilib/*")),
     ],
     test_suite="tests",
     install_requires=[
         "jsonschema",
         "kobo",
         "lxml",
-        "productmd>=1.45",
+        "productmd>=1.23",
+        "six",
         "dogpile.cache",
     ],
-    tests_require=["pytest", "pytest-cov", "pyfakefs"],
+    extras_require={':python_version=="2.7"': ["enum34", "lockfile"]},
+    tests_require=["mock", "pytest", "pytest-cov"],
 )

sources

@@ -1 +0,0 @@
-SHA512 (pungi-4.10.1.tar.bz2) = 4ff1005ece77ac9b41ac31c3b0bcdd558afaaea4d99bf178d42b24a4318ccc9a5576ad4740446f1589a07f88f59f5cb4954d182f3f4e15b1a798e19d9a54fb22

test-requirements.txt

@@ -1,3 +1,5 @@
+mock
 parameterized
 pytest
 pytest-cov
+unittest2

tests/Dockerfile-test

@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:latest
+FROM fedora:33
 LABEL \
     name="Pungi test" \
     description="Run tests using tox with Python 3" \
@@ -6,7 +6,6 @@ LABEL \
     license="MIT"
 
 RUN dnf -y update && dnf -y install \
-        --setopt=install_weak_deps=false \
         findutils \
         libmodulemd \
         git \
@@ -16,7 +15,6 @@ RUN dnf -y update && dnf -y install \
         python3-gobject-base \
         python3-tox \
         python3-urlgrabber \
-        python3-dnf \
     && dnf clean all
 
 WORKDIR /src

tests/Dockerfile-test-py2

@@ -0,0 +1,27 @@
+FROM centos:7
+LABEL \
+    name="Pungi test" \
+    description="Run tests using tox with Python 2" \
+    vendor="Pungi developers" \
+    license="MIT"
+
+RUN yum -y update && yum -y install epel-release && yum -y install \
+        git \
+        libmodulemd2 \
+        make \
+        python3 \
+        python-createrepo_c \
+        python-gobject-base \
+        python-gssapi \
+        python-libcomps \
+        pykickstart \
+    && yum clean all
+
+# python-tox in yum repo is too old, let's install latest version
+RUN pip3 install tox
+
+WORKDIR /src
+
+COPY . .
+
+CMD ["tox", "-e", "py27"]

tests/Jenkinsfile

@@ -1,3 +1,5 @@
+def DUFFY_SESSION_ID
+
 pipeline {
     agent {
         label 'cico-workspace'
@@ -15,7 +17,6 @@ pipeline {
                     if (params.REPO == "" || params.BRANCH == "") {
                         error "Please supply both params (REPO and BRANCH)"
                     }
-                    def DUFFY_SESSION_ID
                     try {
                         echo "Requesting duffy node ..."
                         def session_str = sh returnStdout: true, script: "set +x; duffy client --url https://duffy.ci.centos.org/api/v1 --auth-name fedora-infra --auth-key $CICO_API_KEY request-session pool=virt-ec2-t2-centos-9s-x86_64,quantity=1"
@@ -39,6 +40,7 @@ git fetch proposed
 git checkout origin/master
 git merge --no-ff "proposed/$params.BRANCH" -m "Merge PR"
 podman run --rm -v .:/src:Z quay.io/exd-guild-compose/pungi-test tox -r -e flake8,black,py3,bandit
+podman run --rm -v .:/src:Z quay.io/exd-guild-compose/pungi-test-py2 tox -r -e py27
                         """
                         sh "cat job.sh"
                         sh "ssh -o StrictHostKeyChecking=no root@$hostname mkdir $remote_dir"

tests/data/specs/build.sh

@@ -35,11 +35,6 @@ for spec in $DIR/*.spec; do
         if [ "$(basename $spec)" == "dummy-skype.spec" ]; then
             continue
         fi
-        if [ "$(basename $spec)" == "dummy-fcoe-target-utils.spec" ]; then
-            if [ "$target" == "ppc" -o "$target" == "s390" -o "$target" == "s390x" ]; then
-                continue
-            fi
-        fi
         echo "Building ${spec/.spec/} for $target"
         rpmbuild --quiet --target=$target -ba --nodeps --define "_srcrpmdir $DIR/../repo/src" --define "_rpmdir $DIR/../repo" $spec
     done

tests/data/test_create_extra_repo/test_repo/repodata/repomd.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
-  <revision>1612479076</revision>
-  <data type="primary">
-    <checksum type="sha256">08941fae6bdb14f3b22bfad38b9d7dcb685a9df58fe8f515a3a0b2fe1af903bb</checksum>
-    <open-checksum type="sha256">2a15e618f049a883d360ccbf3e764b30640255f47dc526c633b1722fe23cbcbc</open-checksum>
-    <location href="repodata/08941fae6bdb14f3b22bfad38b9d7dcb685a9df58fe8f515a3a0b2fe1af903bb-primary.xml.gz"/>
-    <timestamp>1612479075</timestamp>
-    <size>1240</size>
-    <open-size>3888</open-size>
-  </data>
-  <data type="filelists">
-    <checksum type="sha256">e37a0b4a63b2b245dca1727195300cd3961f80aebc82ae7b9849dbf7482f5d0f</checksum>
-    <open-checksum type="sha256">b1782bc4207a5b7c3e64115d5a1d001802e8d363f022ea165df7cdab6f14651c</open-checksum>
-    <location href="repodata/e37a0b4a63b2b245dca1727195300cd3961f80aebc82ae7b9849dbf7482f5d0f-filelists.xml.gz"/>
-    <timestamp>1612479075</timestamp>
-    <size>439</size>
-    <open-size>1295</open-size>
-  </data>
-  <data type="other">
-    <checksum type="sha256">92992176bce71dcde9e4b6ad1442e7b5c7f3de9b7f019a2cd27d042ab38ea2b1</checksum>
-    <open-checksum type="sha256">3b847919691ad32279b13463de6c08f1f8b32f51e87b7d8d7e95a3ec2f46ef51</open-checksum>
-    <location href="repodata/92992176bce71dcde9e4b6ad1442e7b5c7f3de9b7f019a2cd27d042ab38ea2b1-other.xml.gz"/>
-    <timestamp>1612479075</timestamp>
-    <size>630</size>
-    <open-size>1911</open-size>
-  </data>
-  <data type="modules">
-    <checksum type="sha256">e7a671401f8e207e4cd3b90b4ac92d621f84a34dc9026f57c3f427fbed444c57</checksum>
-    <open-checksum type="sha256">d59fee86c18018cc18bb7325aa74aa0abf923c64d29a4ec45e08dcd01a0c3966</open-checksum>
-    <location href="repodata/e7a671401f8e207e4cd3b90b4ac92d621f84a34dc9026f57c3f427fbed444c57-modules.yaml.gz"/>
-    <timestamp>1612479075</timestamp>
-    <size>920</size>
-    <open-size>3308</open-size>
-  </data>
-</repomd>

tests/data/test_create_packages_json/test_repo/repodata/repomd.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
-  <revision>1666177486</revision>
-  <data type="primary">
-    <checksum type="sha256">89cb9cc1181635c9147864a7076d91fb81072641d481cd202832a2d257453576</checksum>
-    <open-checksum type="sha256">07255d9856f7531b52a6459f6fc7701c6d93c6d6c29d1382d83afcc53f13494a</open-checksum>
-    <location href="repodata/89cb9cc1181635c9147864a7076d91fb81072641d481cd202832a2d257453576-primary.xml.gz"/>
-    <timestamp>1666177486</timestamp>
-    <size>1387</size>
-    <open-size>6528</open-size>
-  </data>
-  <data type="filelists">
-    <checksum type="sha256">f69ca03957574729fd5150335b0d87afddcfb37a97aed5b06272212854f1773d</checksum>
-    <open-checksum type="sha256">c2e1e674d7d48bccaa16cae0a5f70cb55ef4cd7352b4d9d4fdaa619075d07dbc</open-checksum>
-    <location href="repodata/f69ca03957574729fd5150335b0d87afddcfb37a97aed5b06272212854f1773d-filelists.xml.gz"/>
-    <timestamp>1666177486</timestamp>
-    <size>1252</size>
-    <open-size>5594</open-size>
-  </data>
-  <data type="other">
-    <checksum type="sha256">b3827bd6c9ea67ffa3912002515c64e4d9fe5c4dacbf7c46b0d8768b7abbb84f</checksum>
-    <open-checksum type="sha256">9ce24c526239e349d023c577b2ae3872c8b0f1888aed1fb24b9b9aa12063fdf3</open-checksum>
-    <location href="repodata/b3827bd6c9ea67ffa3912002515c64e4d9fe5c4dacbf7c46b0d8768b7abbb84f-other.xml.gz"/>
-    <timestamp>1666177486</timestamp>
-    <size>999</size>
-    <open-size>6320</open-size>
-  </data>
-  <data type="primary_db">
-    <checksum type="sha256">ab8df35061dfa0285069b843f24a7076e31266d9a8abe8282340bcb936aa61d7</checksum>
-    <open-checksum type="sha256">2bce9554ce4496cef34b5cd69f186f7f3143c7cabae8fa384fc5c9eeab326f7f</open-checksum>
-    <location href="repodata/ab8df35061dfa0285069b843f24a7076e31266d9a8abe8282340bcb936aa61d7-primary.sqlite.bz2"/>
-    <timestamp>1666177486</timestamp>
-    <size>3558</size>
-    <open-size>106496</open-size>
-    <database_version>10</database_version>
-  </data>
-  <data type="filelists_db">
-    <checksum type="sha256">8bcf6d40db4e922934ac47e8ac7fb8d15bdacf579af8c819d2134ed54d30550b</checksum>
-    <open-checksum type="sha256">f7001d1df7f5f7e4898919b15710bea8ed9711ce42faf68e22b757e63169b1fb</open-checksum>
-    <location href="repodata/8bcf6d40db4e922934ac47e8ac7fb8d15bdacf579af8c819d2134ed54d30550b-filelists.sqlite.bz2"/>
-    <timestamp>1666177486</timestamp>
-    <size>2360</size>
-    <open-size>28672</open-size>
-    <database_version>10</database_version>
-  </data>
-  <data type="other_db">
-    <checksum type="sha256">01b82e9eb7ee9151f283c6e761ae450de18ed2d64b5e32de88689eaf95216a80</checksum>
-    <open-checksum type="sha256">07f5b9750af1e440d37ca216e719dd288149e79e9132f2fdccb6f73b2e5dd541</open-checksum>
-    <location href="repodata/01b82e9eb7ee9151f283c6e761ae450de18ed2d64b5e32de88689eaf95216a80-other.sqlite.bz2"/>
-    <timestamp>1666177486</timestamp>
-    <size>2196</size>
-    <open-size>32768</open-size>
-    <database_version>10</database_version>
-  </data>
-</repomd>