almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Remove patches reverting upstream pr#778

Browse Source 
The problem was fixed on rpm-ostree/libdnf level.
This commit is contained in:
Lubomír Sedlář 2018-11-12 09:25:50 +01:00
parent 7c9cc3eb5d
commit 15bb68ebce
4 changed files with 0 additions and 1218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

619
0001-Revert-Move-ostree-phase-and-pipelines-for-running-p.patch
View File

@ -1,619 +0,0 @@
From 9f3201908a6edc5d559e02b98060ba9781d99114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Wed, 11 Apr 2018 09:18:59 +0200
Subject: [PATCH 1/3] Revert "Move ostree phase and pipelines for running
phases"
This reverts commit 660c04368ba1abed310f121d01f0fa029eea5f11.
---
bin/pungi-koji | 54 +++++++------
doc/_static/phases.svg | 162 +++++++++++++++++++++++++++++----------
pungi/phases/__init__.py | 19 ++++-
pungi/phases/weaver.py | 72 -----------------
tests/test_phase_base.py | 129 +++++++------------------------
5 files changed, 198 insertions(+), 238 deletions(-)
delete mode 100644 pungi/phases/weaver.py
diff --git a/bin/pungi-koji b/bin/pungi-koji
index 42dcb424..f6971591 100755
--- a/bin/pungi-koji
+++ b/bin/pungi-koji
@@ -367,27 +367,41 @@ def run_compose(compose, create_latest_link=True, latest_link_status=None):
# Store the password
compose.conf["signing_key_password"] = signing_key_password
+ # INIT phase
init_phase.start()
init_phase.stop()
+ # PKGSET phase
pkgset_phase.start()
pkgset_phase.stop()
- # WEAVER phase - launches other phases which can safely run in parallel
- essentials_schema = (
- buildinstall_phase,
- (gather_phase, extrafiles_phase, createrepo_phase),
- (ostree_phase, ostree_installer_phase),
- )
- essentials_phase = pungi.phases.WeaverPhase(compose, essentials_schema)
- essentials_phase.start()
- essentials_phase.stop()
+ # BUILDINSTALL phase - start, we can run gathering, extra files and
+ # createrepo while buildinstall is in progress.
+ buildinstall_phase.start()
+
+ # If any of the following three phases fail, we must ensure that
+ # buildinstall is stopped. Otherwise the whole process will hang.
+ try:
+ gather_phase.start()
+ gather_phase.stop()
+
+ extrafiles_phase.start()
+ extrafiles_phase.stop()
+
+ createrepo_phase.start()
+ createrepo_phase.stop()
+
+ finally:
+ buildinstall_phase.stop()
if not buildinstall_phase.skip():
buildinstall_phase.copy_files()
- productimg_phase.start()
- productimg_phase.stop()
+ ostree_phase.start()
+ ostree_phase.stop()
+
+ pungi.phases.run_all([productimg_phase,
+ ostree_installer_phase])
# write treeinfo before ISOs are created
for variant in compose.get_variants():
@@ -403,17 +417,12 @@ def run_compose(compose, create_latest_link=True, latest_link_status=None):
pungi.metadata.write_media_repo(compose, arch, variant, timestamp)
# Start all phases for image artifacts
- compose_images_schema = (
- createiso_phase,
- extra_isos_phase,
- liveimages_phase,
- image_build_phase,
- livemedia_phase,
- osbs_phase,
- )
- compose_images_phase = pungi.phases.WeaverPhase(compose, compose_images_schema)
- compose_images_phase.start()
- compose_images_phase.stop()
+ pungi.phases.run_all([createiso_phase,
+ extra_isos_phase,
+ liveimages_phase,
+ image_build_phase,
+ livemedia_phase,
+ osbs_phase])
image_checksum_phase.start()
image_checksum_phase.stop()
@@ -422,6 +431,7 @@ def run_compose(compose, create_latest_link=True, latest_link_status=None):
compose.im.dump(compose.paths.compose.metadata("images.json"))
osbs_phase.dump_metadata()
+ # TEST phase
test_phase.start()
test_phase.stop()
diff --git a/doc/_static/phases.svg b/doc/_static/phases.svg
index 7bbc5e1f..611eb06b 100644
--- a/doc/_static/phases.svg
+++ b/doc/_static/phases.svg
@@ -104,7 +104,87 @@
style="font-size:13.14787769px;line-height:1.25">Pkgset</tspan></text>
</g>
<g
- transform="translate(3.704976,-80.47309)"
+ transform="translate(-4.582059,-80.47309)"
+ id="g3416">
+ <rect
+ style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect3342"
+ width="26.295755"
+ height="231.47725"
+ x="953.49097"
+ y="108.04571"
+ 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="110.35005"
+ y="971.54041"
+ id="text3364"><tspan
+ sodipodi:role="line"
+ id="tspan3366"
+ x="110.35005"
+ y="971.54041"
+ style="font-size:13.14787769px;line-height:1.25">Buildinstall</tspan></text>
+ <rect
+ style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect3344"
+ width="26.295755"
+ height="54.197887"
+ x="989.65247"
+ y="112.96759"
+ 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="115.82405"
+ y="1007.7019"
+ id="text3368"><tspan
+ sodipodi:role="line"
+ id="tspan3370"
+ x="115.82405"
+ y="1007.7019"
+ style="font-size:13.14787769px;line-height:1.25">Gather</tspan></text>
+ <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="989.65247"
+ y="172.61172"
+ 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="174.91608"
+ y="1007.7019"
+ id="text3372"><tspan
+ sodipodi:role="line"
+ id="tspan3374"
+ x="174.91608"
+ y="1007.7019"
+ style="font-size:13.14787769px;line-height:1.25">ExtraFiles</tspan></text>
+ <rect
+ style="fill:#e9b96e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect3348"
+ width="26.295755"
+ height="78.636055"
+ x="989.65247"
+ y="250.78795"
+ 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="253.64439"
+ y="1006.312"
+ id="text3376"><tspan
+ sodipodi:role="line"
+ id="tspan3378"
+ x="253.64439"
+ y="1006.312"
+ style="font-size:13.14787769px;line-height:1.25">Createrepo</tspan></text>
+ </g>
+ <g
+ transform="translate(63.81395,-80.47309)"
id="g3446">
<rect
y="554.10059"
@@ -127,7 +207,7 @@
style="font-size:13.14749908px;line-height:1.25">ImageChecksum</tspan></text>
</g>
<g
- transform="translate(125.75393,-80.47309)"
+ transform="translate(185.8629,-80.47309)"
id="g3398">
<rect
y="553.98242"
@@ -150,14 +230,15 @@
style="font-size:13.14787769px;line-height:1.25">Test</tspan></text>
</g>
<g
- id="g3720">
+ transform="translate(2.318656,-80.47309)"
+ id="g3406">
<rect
style="fill:#fce94f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="rect3336"
width="26.295755"
height="39.669899"
- x="873.01788"
- y="2.3186533"
+ x="953.49097"
+ y="-2.7716319e-06"
transform="matrix(0,1,1,0,0,0)" />
<text
xml:space="preserve"
@@ -167,8 +248,8 @@
id="text3356"><tspan
sodipodi:role="line"
id="tspan3358"
- x="6.2600794"
- y="891.1604"
+ x="1.1060941"
+ y="971.63348"
style="font-size:13.14787769px;line-height:1.25">Init</tspan></text>
</g>
<path
@@ -177,40 +258,41 @@
d="M 100.90864,859.8891 H 654.22706"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.17466855px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" />
<g
- id="g241"
- transform="translate(-60.108974,42.1407)">
+ transform="translate(86.469501,49.471116)"
+ id="g3408">
<rect
- style="fill:#a40000;fill-rule:evenodd;stroke:none;stroke-width:1.10477591px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="rect3350"
+ style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="rect3350-3"
width="26.295755"
- height="101.73411"
- x="830.8772"
- y="400.8551"
+ height="53.653927"
+ x="823.54675"
+ y="254.60153"
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:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- x="403.15945"
- y="847.65234"
- id="text3380"><tspan
+ 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"
+ x="256.90588"
+ y="840.3219"
+ id="text3380-2"><tspan
+ y="840.3219"
+ x="256.90588"
sodipodi:role="line"
- id="tspan3382"
- x="403.15945"
- y="847.65234"
- style="font-size:13.14787769px;line-height:1.25">Productimg</tspan></text>
+ id="tspan3406"
+ style="font-size:13.14787769px;line-height:1.25">OSTree</tspan></text>
</g>
<g
- id="g3668">
+ id="g251"
+ transform="translate(0,42.1407)">
<g
- id="g3663">
+ id="g241">
<rect
transform="matrix(0,1,1,0,0,0)"
- y="103.46365"
- x="873.01788"
- height="231.47725"
+ y="400.8551"
+ x="830.8772"
+ height="101.73411"
width="26.295755"
- id="rect3342"
- style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ id="rect3350"
+ style="fill:#a40000;fill-rule:evenodd;stroke:none;stroke-width:1.10477591px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<text
id="text3364"
y="891.06732"
@@ -287,22 +369,22 @@
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
style="font-size:13.14787769px;line-height:1.25"
- y="921.86945"
- x="243.95874"
- id="tspan3378"
- sodipodi:role="line">Createrepo</tspan></text>
+ y="847.65234"
+ x="403.15945"
+ id="tspan3382"
+ sodipodi:role="line">Productimg</tspan></text>
</g>
<g
- id="g3408"
- transform="translate(-150.564,114.11662)">
+ transform="translate(-89.482556,-154.87768)"
+ id="g288">
<rect
transform="matrix(0,1,1,0,0,0)"
- y="254.60153"
- x="823.54675"
- height="53.653927"
+ y="490.33765"
+ x="1022.637"
+ height="101.85102"
width="26.295755"
- id="rect3350-3"
- style="fill:#729fcf;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ id="rect3428"
+ style="fill:#fcaf3e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<text
id="text3380-2"
y="840.3219"
diff --git a/pungi/phases/__init__.py b/pungi/phases/__init__.py
index 0ed3e564..77720f80 100644
--- a/pungi/phases/__init__.py
+++ b/pungi/phases/__init__.py
@@ -17,7 +17,6 @@ import sys
# phases in runtime order
from .init import InitPhase # noqa
-from .weaver import WeaverPhase # noqa
from .pkgset import PkgsetPhase # noqa
from .gather import GatherPhase # noqa
from .createrepo import CreaterepoPhase # noqa
@@ -39,3 +38,21 @@ from .phases_metadata import gather_phases_metadata # noqa
this_module = sys.modules[__name__]
PHASES_NAMES = gather_phases_metadata(this_module)
+
+
+def run_all(phases):
+ """Start and stop all given phases and make them run in parallel.
+
+ This function makes sure that even if one of the phases fails and raises an
+ exception, all the phases will still be correctly stopped.
+
+ If multiple phases fail, a exception from one of them will be raised, but
+ there are no guarantees which one it will be.
+ """
+ if not phases:
+ return
+ phases[0].start()
+ try:
+ run_all(phases[1:])
+ finally:
+ phases[0].stop()
diff --git a/pungi/phases/weaver.py b/pungi/phases/weaver.py
deleted file mode 100644
index e5dc6ca2..00000000
--- a/pungi/phases/weaver.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from kobo import shortcuts
-from kobo.threads import ThreadPool, WorkerThread
-
-
-class WeaverPhase(object):
- """
- Special "phase" that manages other phases' run.
- It needs input-running schema where particular phases are composed
- sequentially and in parallel as well. A Sequential set of phases
- is named "pipeline".
- If any of the phases fail, we must ensure that others will stop correctly.
- Otherwise the whole process will hang.
-
- :param compose: it is needed for logging
- :param phases_schema: two-dimensional array of phases. Top dimension
- denotes particular pipelines. Second dimension contains phases.
- """
- name = "weaver"
-
- def __init__(self, compose, phases_schema):
- self.msg = "---------- PHASE: %s ----------" % self.name.upper()
- self.compose = compose
- self.finished = False
- self.pool = ThreadPool(logger=self.compose._logger)
- if not phases_schema:
- msg = "No running schema was set for WeaverPhase"
- self.pool.log_error(msg)
- raise ValueError(msg)
- self._phases_schema = phases_schema
-
- def start(self):
- if self.finished:
- msg = "Phase '%s' has already finished and can not be started twice" % self.name
- self.pool.log_error(msg)
- raise RuntimeError(msg)
-
- self.compose.log_info("[BEGIN] %s" % self.msg)
- self.run()
-
- def run(self):
- for pipeline in shortcuts.force_list(self._phases_schema):
- self.pool.add(PipelineThread(self.pool))
- self.pool.queue_put(shortcuts.force_list(pipeline))
-
- self.pool.start()
-
- def stop(self):
- if self.finished:
- return
- if hasattr(self, "pool"):
- self.pool.stop()
- self.finished = True
- self.compose.log_info("[DONE ] %s" % self.msg)
-
-
-class PipelineThread(WorkerThread):
- """
- Launches phases in pipeline sequentially
- """
- def process(self, item, num):
- pipeline = shortcuts.force_list(item)
- phases_names = ", ".join(phase.name for phase in pipeline)
- msg = "Running pipeline (%d/%d). Phases: %s" % (num, self.pool.queue_total, phases_names)
- self.pool.log_info("[BEGIN] %s" % (msg,))
-
- for phase in pipeline:
- phase.start()
- phase.stop()
-
- self.pool.log_info("[DONE ] %s" % (msg,))
diff --git a/tests/test_phase_base.py b/tests/test_phase_base.py
index ba80afe3..a8b9469a 100644
--- a/tests/test_phase_base.py
+++ b/tests/test_phase_base.py
@@ -7,13 +7,11 @@ try:
except ImportError:
import unittest
import os
-import random
import sys
-import time
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
-from pungi.phases import base, weaver
+from pungi.phases import run_all, base
from tests.helpers import DummyCompose, PungiTestCase, boom
@@ -74,124 +72,49 @@ class ImageConfigMixinTestCase(PungiTestCase):
self.assertEqual(resolve_git_url.num, 3, 'Resolver was not called three times')
-class TestWeaver(unittest.TestCase):
- def setUp(self):
- # prepare 6 phase mock-objects.
- for test_phase_number in range(1, 7):
- # This is equvalent to:
- # self.pX = mock.Mock()
- # self.pX.name = "phase X"
- # self.pX.start = default_method
- test_phase_name = "p" + repr(test_phase_number)
- tmp = mock.Mock()
- tmp.name = "phase %d" % test_phase_number
- tmp.start.side_effect = self.method_regular
- setattr(self, test_phase_name, tmp)
-
- self.compose = DummyCompose(None, {})
-
- def method_regular(self):
- """
- It only have to cause some delay (tens of miliseconds).
- Delay is needed for threads that has enough time to start.
- """
- multiplier = random.sample(range(1, 10), 1)
- time.sleep(multiplier[0] * 0.01)
-
- def method_with_exception(self):
- self.method_regular() # make some delay
- boom() # throw exception
-
+class TestRunAll(unittest.TestCase):
def assertFinalized(self, p):
self.assertEqual(p.mock_calls, [mock.call.start(), mock.call.stop()])
- def assertInterrupted(self, p):
- self.assertEqual(p.mock_calls, [mock.call.start()])
-
- def assertMissed(self, p):
- self.assertEqual(p.mock_calls, [])
-
- def test_parallel(self):
- phases_schema = (self.p1, self.p2)
- weaver_phase = weaver.WeaverPhase(self.compose, phases_schema)
- weaver_phase.start()
- weaver_phase.stop()
-
- self.assertFinalized(self.p1)
- self.assertFinalized(self.p2)
-
- def test_pipeline(self):
- phases_schema = ((self.p1, self.p2),)
- weaver_phase = weaver.WeaverPhase(self.compose, phases_schema)
- weaver_phase.start()
- weaver_phase.stop()
+ def test_calls_stop(self):
+ p1 = mock.Mock()
+ p2 = mock.Mock()
- self.assertFinalized(self.p1)
- self.assertFinalized(self.p2)
+ run_all([p1, p2])
- def test_stop_on_failure(self):
- self.p2.start.side_effect = self.method_with_exception
+ self.assertFinalized(p1)
+ self.assertFinalized(p2)
- phases_schema = ((self.p1, self.p2, self.p3),) # one pipeline
- weaver_phase = weaver.WeaverPhase(self.compose, phases_schema)
- with self.assertRaises(Exception) as ctx:
- weaver_phase.start()
- weaver_phase.stop()
-
- self.assertEqual('BOOM', str(ctx.exception))
- self.assertFinalized(self.p1)
- self.assertInterrupted(self.p2)
- self.assertMissed(self.p3)
+ def test_calls_stop_on_failure(self):
+ p1 = mock.Mock()
+ p2 = mock.Mock()
+ p3 = mock.Mock()
- def test_parallel_stop_on_failure(self):
- self.p2.start.side_effect = self.method_with_exception
+ p2.stop.side_effect = boom
- phases_schema = (self.p1, self.p2, self.p3) # one pipeline
- weaver_phase = weaver.WeaverPhase(self.compose, phases_schema)
with self.assertRaises(Exception) as ctx:
- weaver_phase.start()
- weaver_phase.stop()
+ run_all([p1, p2, p3])
self.assertEqual('BOOM', str(ctx.exception))
- self.assertFinalized(self.p1)
- self.assertInterrupted(self.p2)
- self.assertFinalized(self.p3)
+ self.assertFinalized(p1)
+ self.assertFinalized(p2)
+ self.assertFinalized(p3)
def test_multiple_fail(self):
- self.p2.start.side_effect = self.method_with_exception
- self.p3.start.side_effect = self.method_with_exception
+ p1 = mock.Mock(name='p1')
+ p2 = mock.Mock(name='p2')
+ p3 = mock.Mock(name='p3')
- phases_schema = ((self.p1, self.p2, self.p3),) # one pipeline
- weaver_phase = weaver.WeaverPhase(self.compose, phases_schema)
- with self.assertRaises(Exception) as ctx:
- weaver_phase.start()
- weaver_phase.stop()
+ p2.stop.side_effect = boom
+ p3.stop.side_effect = boom
- self.assertEqual('BOOM', str(ctx.exception))
- self.assertFinalized(self.p1)
- self.assertInterrupted(self.p2)
- self.assertMissed(self.p3)
-
- def test_multi_pipeline(self):
- self.p2.start.side_effect = self.method_with_exception
- phases_schema = (
- self.p1,
- (self.p2, self.p3, self.p4),
- (self.p5, self.p6),
- )
-
- weaver_phase = weaver.WeaverPhase(self.compose, phases_schema)
with self.assertRaises(Exception) as ctx:
- weaver_phase.start()
- weaver_phase.stop()
+ run_all([p1, p2, p3])
self.assertEqual('BOOM', str(ctx.exception))
- self.assertFinalized(self.p1)
- self.assertInterrupted(self.p2)
- self.assertMissed(self.p3)
- self.assertMissed(self.p4)
- self.assertFinalized(self.p5)
- self.assertFinalized(self.p6)
+ self.assertFinalized(p1)
+ self.assertFinalized(p2)
+ self.assertFinalized(p3)
if __name__ == "__main__":
--
2.17.1

309
0002-Revert-Other-repo-for-OstreeInstaller.patch
View File

@ -1,309 +0,0 @@
From 2fffbaf2b09a44e85a597e45bb258e3bcb98743f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Wed, 11 Apr 2018 09:19:53 +0200
Subject: [PATCH 2/3] Revert "Other repo for OstreeInstaller"
This reverts commit 5c081cb545715c2a912ff50fa57554e89d905868.
---
pungi/checks.py | 3 +-
pungi/phases/ostree_installer.py | 18 ++--------
pungi/util.py | 21 ++++-------
tests/test_ostree_installer_phase.py | 54 ++++++++++------------------
4 files changed, 29 insertions(+), 67 deletions(-)
diff --git a/pungi/checks.py b/pungi/checks.py
index 7a2f9a8d..673b3666 100644
--- a/pungi/checks.py
+++ b/pungi/checks.py
@@ -1030,7 +1030,7 @@ def make_schema():
"tag_ref": {"type": "boolean"},
"ostree_ref": {"type": "string"},
},
- "required": ["treefile", "config_url", "ostree_repo"],
+ "required": ["treefile", "config_url", "repo", "ostree_repo"],
"additionalProperties": False,
}),
]
@@ -1051,6 +1051,7 @@ def make_schema():
"template_repo": {"type": "string"},
"template_branch": {"type": "string"},
},
+ "required": ["repo"],
"additionalProperties": False,
}),
diff --git a/pungi/phases/ostree_installer.py b/pungi/phases/ostree_installer.py
index 587ff2c5..861d9db1 100644
--- a/pungi/phases/ostree_installer.py
+++ b/pungi/phases/ostree_installer.py
@@ -9,7 +9,7 @@ from kobo import shortcuts
from .base import ConfigGuardedPhase, PhaseLoggerMixin
from .. import util
-from ..util import get_volid, get_repo_urls, version_generator, translate_path
+from ..util import get_volid, get_repo_urls, version_generator
from ..wrappers import kojiwrapper, iso, lorax, scm
@@ -62,21 +62,7 @@ class OstreeInstallerThread(WorkerThread):
self.pool.log_info('[BEGIN] %s' % msg)
self.logdir = compose.paths.log.topdir('%s/%s/ostree_installer-%s' % (arch, variant, self.num))
- repo_baseurl = compose.paths.work.arch_repo('$basearch', create_dir=False)
- repos = get_repo_urls(None, # compose==None. Special value says that method should ignore deprecated variant-type repo
- shortcuts.force_list(config['repo'])
- + shortcuts.force_list(translate_path(compose, repo_baseurl)),
- arch=arch,
- logger=self.pool)
- if compose.has_comps:
- repos.append(
- translate_path(
- compose,
- compose.paths.work.comps_repo(
- '$basearch', variant=variant, create_dir=False
- ),
- )
- )
+ repos = get_repo_urls(compose, shortcuts.force_list(config['repo']), arch=arch)
repos = [url.replace('$arch', arch) for url in repos]
output_dir = os.path.join(compose.paths.work.topdir(arch), variant.uid, 'ostree_installer')
util.makedirs(os.path.dirname(output_dir))
diff --git a/pungi/util.py b/pungi/util.py
index 3a31ca87..37b4d5f5 100644
--- a/pungi/util.py
+++ b/pungi/util.py
@@ -691,8 +691,6 @@ def get_repo_url(compose, repo, arch='$basearch'):
Convert repo to repo URL.
@param compose - required for access to variants
- special value compose==None determines that method is called during
- OSTreeInstaller phase where variant-type source repository is deprecated
@param repo - string or a dict which at least contains 'baseurl' key
@param arch - string to be used as arch in repo url
"""
@@ -703,17 +701,14 @@ def get_repo_url(compose, repo, arch='$basearch'):
raise RuntimeError('Baseurl is required in repo dict %s' % str(repo))
if '://' not in repo:
# this is a variant name
- if compose is not None:
- v = compose.all_variants.get(repo)
- if not v:
- raise RuntimeError('There is no variant %s to get repo from.' % repo)
- else:
- return None
+ v = compose.all_variants.get(repo)
+ if not v:
+ raise RuntimeError('There is no variant %s to get repo from.' % repo)
repo = translate_path(compose, compose.paths.compose.repository(arch, v, create_dir=False))
return repo
-def get_repo_urls(compose, repos, arch='$basearch', logger=None):
+def get_repo_urls(compose, repos, arch='$basearch'):
"""
Convert repos to a list of repo URLs.
@@ -724,11 +719,7 @@ def get_repo_urls(compose, repos, arch='$basearch', logger=None):
urls = []
for repo in repos:
repo = get_repo_url(compose, repo, arch=arch)
- if repo is None:
- if logger:
- logger.log_warning("Variant-type source repository is deprecated and will be ignored during 'OSTreeInstaller' phase: %s" % (repo))
- else:
- urls.append(repo)
+ urls.append(repo)
return urls
@@ -786,7 +777,7 @@ def get_repo_dicts(repos, logger=None):
repo_dict = get_repo_dict(repo)
if repo_dict == {}:
if logger:
- logger.log_warning("Variant-type source repository is deprecated and will be ignored during 'OSTree' phase: %s" % (repo))
+ logger.log_warning("Variant-type source repository is deprecated and will be ignored during 'ostree' phase: %s" % (repo))
else:
repo_dicts.append(repo_dict)
return repo_dicts
diff --git a/tests/test_ostree_installer_phase.py b/tests/test_ostree_installer_phase.py
index 80e68d42..459ae063 100644
--- a/tests/test_ostree_installer_phase.py
+++ b/tests/test_ostree_installer_phase.py
@@ -14,7 +14,6 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
from tests import helpers
from pungi.phases import ostree_installer as ostree
-from six.moves import shlex_quote
LOG_PATH = 'logs/x86_64/Everything/ostree_installer-1'
@@ -98,9 +97,6 @@ class OstreeThreadTest(helpers.PungiTestCase):
'koji_profile': 'koji',
'runroot_tag': 'rrt',
'image_volid_formats': ['{release_short}-{variant}-{arch}'],
- 'translate_paths': [
- (self.topdir + '/work', 'http://example.com/work')
- ],
})
def assertImageAdded(self, compose, ImageCls, iso):
@@ -127,7 +123,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
]
for s in force_list(sources):
- lorax_cmd.append(shlex_quote('--source=%s' % s))
+ lorax_cmd.append('--source=%s' % s)
lorax_cmd.append('--variant=Everything')
lorax_cmd.append('--nomacboot')
@@ -182,7 +178,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
self.compose.supported = False
pool = mock.Mock()
cfg = {
- 'repo': 'Everything', # this variant-type repo is deprecated, in result will be replaced with default repo
+ 'repo': 'Everything',
'release': '20160321.n.0',
}
koji = KojiWrapper.return_value
@@ -200,8 +196,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
self.assertRunrootCall(koji,
- ['http://example.com/work/$basearch/repo',
- 'http://example.com/work/$basearch/comps_repo_Everything'],
+ 'file://%s/compose/Everything/x86_64/os' % self.topdir,
cfg['release'],
extra=['--logfile=%s/%s/lorax.log' % (self.topdir, LOG_PATH)])
self.assertIsoLinked(link, get_file_size, get_mtime, final_iso_path)
@@ -236,12 +231,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
- self.assertRunrootCall(koji,
- ('http://example.com/repo/x86_64/',
- 'http://example.com/work/$basearch/repo',
- 'http://example.com/work/$basearch/comps_repo_Everything'),
- cfg['release'],
- isfinal=True,
+ self.assertRunrootCall(koji, 'http://example.com/repo/x86_64/', cfg['release'], isfinal=True,
extra=['--logfile=%s/%s/lorax.log' % (self.topdir, LOG_PATH)])
self.assertIsoLinked(link, get_file_size, get_mtime, final_iso_path)
self.assertImageAdded(self.compose, ImageCls, iso)
@@ -260,7 +250,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
cfg = {
'release': '20160321.n.0',
'repo': [
- 'Everything', # this variant-type repo is deprecated, in result will be replaced with default repo
+ 'Everything',
'https://example.com/extra-repo1.repo',
'https://example.com/extra-repo2.repo',
],
@@ -277,10 +267,9 @@ class OstreeThreadTest(helpers.PungiTestCase):
t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
sources = [
+ 'file://%s/compose/Everything/x86_64/os' % self.topdir,
'https://example.com/extra-repo1.repo',
- 'https://example.com/extra-repo2.repo',
- 'http://example.com/work/$basearch/repo',
- 'http://example.com/work/$basearch/comps_repo_Everything',
+ 'https://example.com/extra-repo2.repo'
]
self.assertRunrootCall(koji, sources, cfg['release'], isfinal=True,
@@ -299,8 +288,8 @@ class OstreeThreadTest(helpers.PungiTestCase):
cfg = {
'release': '20160321.n.0',
'repo': [
- 'Everything', # this variant-type repo is deprecated, in result will be replaced with default repo
- 'Server', # this variant-type repo is deprecated, in result will be replaced with default repo
+ 'Everything',
+ 'Server',
'https://example.com/extra-repo1.repo',
'https://example.com/extra-repo2.repo',
],
@@ -317,10 +306,10 @@ class OstreeThreadTest(helpers.PungiTestCase):
t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
sources = [
+ 'file://%s/compose/Everything/x86_64/os' % self.topdir,
+ 'file://%s/compose/Server/x86_64/os' % self.topdir,
'https://example.com/extra-repo1.repo',
- 'https://example.com/extra-repo2.repo',
- 'http://example.com/work/$basearch/repo',
- 'http://example.com/work/$basearch/comps_repo_Everything',
+ 'https://example.com/extra-repo2.repo'
]
self.assertRunrootCall(koji, sources, cfg['release'], isfinal=True,
@@ -353,9 +342,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
t.process((self.compose, self.compose.variants['Everything'], 'x86_64', cfg), 1)
- sources = [
- 'http://example.com/work/$basearch/repo',
- ]
+ sources = []
self.assertRunrootCall(koji, sources, cfg['release'], isfinal=True,
extra=['--logfile=%s/%s/lorax.log' % (self.topdir, LOG_PATH)])
@@ -405,7 +392,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
get_dir_from_scm):
pool = mock.Mock()
cfg = {
- 'repo': 'Everything', # this variant-type repo is deprecated, in result will be replaced with default repo
+ 'repo': 'Everything',
'release': '20160321.n.0',
'add_template': ['some_file.txt'],
'add_arch_template': ['other_file.txt'],
@@ -432,8 +419,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
'branch': 'f24', 'dir': '.'},
templ_dir, logger=pool._logger)])
self.assertRunrootCall(koji,
- ['http://example.com/work/$basearch/repo',
- 'http://example.com/work/$basearch/comps_repo_Everything'],
+ 'file://%s/compose/Everything/x86_64/os' % self.topdir,
cfg['release'],
isfinal=True,
extra=['--add-template=%s/some_file.txt' % templ_dir,
@@ -454,7 +440,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
get_file_size, get_mtime, ImageCls, copy_all):
pool = mock.Mock()
cfg = {
- 'repo': 'Everything', # this variant-type repo is deprecated, in result will be replaced with default repo
+ 'repo': 'Everything',
'release': '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN',
"installpkgs": ["fedora-productimg-atomic"],
"add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"],
@@ -486,8 +472,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
self.assertRunrootCall(
koji,
- ['http://example.com/work/$basearch/repo',
- 'http://example.com/work/$basearch/comps_repo_Everything'],
+ 'file://%s/compose/Everything/x86_64/os' % self.topdir,
'20151203.t.0',
isfinal=True,
extra=['--installpkgs=fedora-productimg-atomic',
@@ -516,7 +501,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
get_file_size, get_mtime, ImageCls, copy_all):
pool = mock.Mock()
cfg = {
- 'repo': 'Everything', # this variant-type repo is deprecated, in result will be replaced with default repo
+ 'repo': 'Everything',
'release': None,
"installpkgs": ["fedora-productimg-atomic"],
"add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"],
@@ -548,8 +533,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
self.assertRunrootCall(
koji,
- ['http://example.com/work/$basearch/repo',
- 'http://example.com/work/$basearch/comps_repo_Everything'],
+ 'file://%s/compose/Everything/x86_64/os' % self.topdir,
'20151203.t.0',
isfinal=True,
extra=['--installpkgs=fedora-productimg-atomic',
--
2.17.1

287
0003-Revert-Ostree-can-use-pkgset-repos.patch
View File

@ -1,287 +0,0 @@
From 625183a5a3c35c68184b5da8166775de691e6d61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Wed, 11 Apr 2018 09:20:51 +0200
Subject: [PATCH 3/3] Revert "Ostree can use pkgset repos"
This reverts commit c7cc200246300c6a3946b2e3a9f5f7693896a7d6.
---
pungi/phases/ostree.py | 7 +---
pungi/util.py | 35 +++++++++++--------
tests/test_config_validate_script.py | 4 ++-
tests/test_ostree_phase.py | 52 +++++-----------------------
tests/test_util.py | 26 +++++++++-----
5 files changed, 50 insertions(+), 74 deletions(-)
diff --git a/pungi/phases/ostree.py b/pungi/phases/ostree.py
index 2918fff8..0550b18c 100644
--- a/pungi/phases/ostree.py
+++ b/pungi/phases/ostree.py
@@ -58,12 +58,7 @@ class OSTreeThread(WorkerThread):
repodir = os.path.join(workdir, 'config_repo')
self._clone_repo(repodir, config['config_url'], config.get('config_branch', 'master'))
- repo_baseurl = compose.paths.work.arch_repo('$basearch', create_dir=False)
- comps_repo = compose.paths.work.comps_repo('$basearch', variant=variant, create_dir=False)
- repos = shortcuts.force_list(config['repo']) + [translate_path(compose, repo_baseurl)]
- if compose.has_comps:
- repos.append(translate_path(compose, comps_repo))
- repos = get_repo_dicts(repos, logger=self.pool)
+ repos = get_repo_dicts(compose, shortcuts.force_list(config['repo']))
# copy the original config and update before save to a json file
new_config = copy.copy(config)
diff --git a/pungi/util.py b/pungi/util.py
index 37b4d5f5..1a95e1f4 100644
--- a/pungi/util.py
+++ b/pungi/util.py
@@ -731,16 +731,19 @@ def _translate_url_to_repo_id(url):
return ''.join([s if s in list(_REPOID_CHARS) else '_' for s in url])
-def get_repo_dict(repo):
+def get_repo_dict(compose, repo, arch='$basearch'):
"""
Convert repo to a dict of repo options.
- If repo is a string that represents url, set it as 'baseurl' in result dict,
- also generate a repo id/name as 'name' key in result dict.
- If repo is a dict, and if 'name' key is missing in the dict, generate one for it.
- Repo (str or dict) that has not url format is no longer processed.
+ If repo is a string, translate it to repo url if necessary (when it's
+ not a url), and set it as 'baseurl' in result dict, also generate
+ a repo id/name as 'name' key in result dict.
+ If repo is a dict, translate value of 'baseurl' key to url if necessary,
+ if 'name' key is missing in the dict, generate one for it.
+ @param compose - required for access to variants
@param repo - A string or dict, if it is a dict, key 'baseurl' is required
+ @param arch - string to be used as arch in repo url
"""
repo_dict = {}
if isinstance(repo, dict):
@@ -750,8 +753,10 @@ def get_repo_dict(repo):
if name is None:
name = _translate_url_to_repo_id(url)
else:
- # url is variant uid - this possibility is now discontinued
- return {}
+ # url is variant uid
+ if name is None:
+ name = '%s-%s' % (compose.compose_id, url)
+ url = get_repo_url(compose, url, arch=arch)
repo['name'] = name
repo['baseurl'] = url
return repo
@@ -762,24 +767,24 @@ def get_repo_dict(repo):
repo_dict['name'] = _translate_url_to_repo_id(repo)
repo_dict['baseurl'] = repo
else:
- return {}
+ repo_dict['name'] = '%s-%s' % (compose.compose_id, repo)
+ repo_dict['baseurl'] = get_repo_url(compose, repo)
+
return repo_dict
-def get_repo_dicts(repos, logger=None):
+def get_repo_dicts(compose, repos, arch='$basearch'):
"""
Convert repos to a list of repo dicts.
+ @param compose - required for access to variants
@param repo - A list of string or dict, if item is a dict, key 'baseurl' is required
+ @param arch - string to be used as arch in repo url
"""
repo_dicts = []
for repo in repos:
- repo_dict = get_repo_dict(repo)
- if repo_dict == {}:
- if logger:
- logger.log_warning("Variant-type source repository is deprecated and will be ignored during 'ostree' phase: %s" % (repo))
- else:
- repo_dicts.append(repo_dict)
+ repo_dict = get_repo_dict(compose, repo, arch=arch)
+ repo_dicts.append(repo_dict)
return repo_dicts
diff --git a/tests/test_config_validate_script.py b/tests/test_config_validate_script.py
index 031a15a4..c73fe126 100644
--- a/tests/test_config_validate_script.py
+++ b/tests/test_config_validate_script.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
+import mock
import os
import subprocess
import sys
@@ -19,7 +20,8 @@ from tests import helpers
class ConfigValidateScriptTest(helpers.PungiTestCase):
- def test_validate_dummy_config(self):
+ @mock.patch('kobo.shortcuts.run')
+ def test_validate_dummy_config(self, run):
DUMMY_CONFIG = os.path.join(HERE, 'data/dummy-pungi.conf')
interp = 'python2' if six.PY2 else 'python3'
p = subprocess.Popen([interp, PUNGI_CONFIG_VALIDATE, DUMMY_CONFIG],
diff --git a/tests/test_ostree_phase.py b/tests/test_ostree_phase.py
index c2986bc8..4ce66bbd 100644
--- a/tests/test_ostree_phase.py
+++ b/tests/test_ostree_phase.py
@@ -118,7 +118,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
'koji_profile': 'koji',
'runroot_tag': 'rrt',
'translate_paths': [
- (self.topdir, 'http://example.com')
+ (self.topdir + '/compose', 'http://example.com')
]
})
self.pool = mock.Mock()
@@ -148,36 +148,6 @@ class OSTreeThreadTest(helpers.PungiTestCase):
return {'task_id': 1234, 'retcode': retcode, 'output': 'Foo bar\n'}
return fake_runroot
- @mock.patch('pungi.wrappers.scm.get_dir_from_scm')
- @mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper')
- def test_extra_config_content(self, KojiWrapper, get_dir_from_scm):
- get_dir_from_scm.side_effect = self._dummy_config_repo
- self.compose.conf['runroot_weights'] = {'ostree': 123}
-
- koji = KojiWrapper.return_value
- koji.run_runroot_cmd.side_effect = self._mock_runroot(0)
-
- t = ostree.OSTreeThread(self.pool)
-
- extra_config_file = os.path.join(self.topdir, 'work/ostree-1/extra_config.json')
- self.assertFalse(os.path.isfile(extra_config_file))
-
- t.process((self.compose, self.compose.variants['Everything'], 'x86_64', self.cfg), 1)
-
- self.assertTrue(os.path.isfile(extra_config_file))
- with open(extra_config_file, 'r') as f:
- extraconf_content = json.load(f)
-
- proper_extraconf_content = {
- "repo": [
- {"name": "http:__example.com_work__basearch_repo",
- "baseurl": "http://example.com/work/$basearch/repo"},
- {"name": "http:__example.com_work__basearch_comps_repo_Everything",
- "baseurl": "http://example.com/work/$basearch/comps_repo_Everything"}
- ]
- }
- self.assertEqual(proper_extraconf_content, extraconf_content)
-
@mock.patch('pungi.wrappers.scm.get_dir_from_scm')
@mock.patch('pungi.wrappers.kojiwrapper.KojiWrapper')
def test_run(self, KojiWrapper, get_dir_from_scm):
@@ -299,7 +269,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
arch='x86_64',
ref='fedora-atomic/25/x86_64',
commitid=None,
- repo_path='http://example.com/place/for/atomic',
+ repo_path=self.repo,
local_repo_path=self.repo)])
@mock.patch('pungi.wrappers.scm.get_dir_from_scm')
@@ -432,14 +402,14 @@ class OSTreeThreadTest(helpers.PungiTestCase):
koji.run_runroot_cmd.side_effect = self._mock_runroot(0)
cfg = {
- 'repo': [ # Variant type repos will not be included into extra_config. This part of the config is deprecated
- 'Everything', # do not include
+ 'repo': [
+ 'Everything',
{
'name': 'repo_a',
'baseurl': 'http://url/to/repo/a',
'exclude': 'systemd-container'
},
- { # do not include
+ {
'name': 'Server',
'baseurl': 'Server',
'exclude': 'systemd-container'
@@ -458,16 +428,12 @@ class OSTreeThreadTest(helpers.PungiTestCase):
extra_config_file = os.path.join(self.topdir, 'work/ostree-1/extra_config.json')
self.assertTrue(os.path.isfile(extra_config_file))
- with open(extra_config_file, 'r') as extra_config_fd:
- extra_config = json.load(extra_config_fd)
+ extra_config = json.load(open(extra_config_file, 'r'))
self.assertTrue(extra_config.get('keep_original_sources', False))
- # should equal to number of valid repositories in cfg['repo'] + default repository + comps repository
- self.assertEqual(len(extra_config.get('repo', [])), 3)
- self.assertEqual(extra_config.get('repo').pop()['baseurl'],
- 'http://example.com/work/$basearch/comps_repo_Everything')
- self.assertEqual(extra_config.get('repo').pop()['baseurl'], 'http://example.com/work/$basearch/repo')
+ self.assertEqual(len(extra_config.get('repo', [])), len(cfg['repo']))
+ self.assertEqual(extra_config.get('repo').pop()['baseurl'], 'http://example.com/Server/$basearch/os')
self.assertEqual(extra_config.get('repo').pop()['baseurl'], 'http://url/to/repo/a')
-
+ self.assertEqual(extra_config.get('repo').pop()['baseurl'], 'http://example.com/Everything/$basearch/os')
if __name__ == '__main__':
unittest.main()
diff --git a/tests/test_util.py b/tests/test_util.py
index 9e247cde..2b93e496 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -624,35 +624,43 @@ class GetRepoFuncsTestCase(unittest.TestCase):
self.assertEqual(util.get_repo_urls(self.compose, repos), expect)
def test_get_repo_dict_from_normal_url(self):
- repo_dict = util.get_repo_dict('http://example.com/repo')
+ repo_dict = util.get_repo_dict(self.compose, 'http://example.com/repo')
expect = {'name': 'http:__example.com_repo', 'baseurl': 'http://example.com/repo'}
self.assertEqual(repo_dict, expect)
def test_get_repo_dict_from_variant_uid(self):
- repo_dict = util.get_repo_dict('Server') # this repo format is deprecated
- expect = {}
+ repo_dict = util.get_repo_dict(self.compose, 'Server')
+ expect = {
+ 'name': "%s-%s" % (self.compose.compose_id, 'Server'),
+ 'baseurl': 'http://example.com/RHEL-8.0-20180101.n.0/compose/Server/$basearch/os',
+ }
self.assertEqual(repo_dict, expect)
def test_get_repo_dict_from_repo_dict(self):
- repo = {'baseurl': 'Server'} # this repo format is deprecated
- expect = {}
- repo_dict = util.get_repo_dict(repo)
+ repo = {'baseurl': 'Server'}
+ expect = {
+ 'name': '%s-%s' % (self.compose.compose_id, 'Server'),
+ 'baseurl': 'http://example.com/RHEL-8.0-20180101.n.0/compose/Server/$basearch/os'
+ }
+ repo_dict = util.get_repo_dict(self.compose, repo)
self.assertEqual(repo_dict, expect)
def test_get_repo_dicts(self):
repos = [
'http://example.com/repo',
- 'Server', # this repo format is deprecated (and will not be included into final repo_dict)
- {'baseurl': 'Client'}, # this repo format is deprecated
+ 'Server',
+ {'baseurl': 'Client'},
{'baseurl': 'ftp://example.com/linux/repo'},
{'name': 'testrepo', 'baseurl': 'ftp://example.com/linux/repo'},
]
expect = [
{'name': 'http:__example.com_repo', 'baseurl': 'http://example.com/repo'},
+ {'name': '%s-%s' % (self.compose.compose_id, 'Server'), 'baseurl': 'http://example.com/RHEL-8.0-20180101.n.0/compose/Server/$basearch/os'},
+ {'name': '%s-%s' % (self.compose.compose_id, 'Client'), 'baseurl': 'http://example.com/RHEL-8.0-20180101.n.0/compose/Client/$basearch/os'},
{'name': 'ftp:__example.com_linux_repo', 'baseurl': 'ftp://example.com/linux/repo'},
{'name': 'testrepo', 'baseurl': 'ftp://example.com/linux/repo'},
]
- repos = util.get_repo_dicts(repos)
+ repos = util.get_repo_dicts(self.compose, repos)
self.assertEqual(repos, expect)
--
2.17.1

3
pungi.spec
View File

@ -7,9 +7,6 @@ Group: Development/Tools
License: GPLv2
URL: https://pagure.io/pungi
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
Patch0: 0001-Revert-Move-ostree-phase-and-pipelines-for-running-p.patch
Patch1: 0002-Revert-Other-repo-for-OstreeInstaller.patch
Patch2: 0003-Revert-Ostree-can-use-pkgset-repos.patch
BuildRequires: python3-nose
BuildRequires: python3-mock