Drop buildinstall method
JIRA: RHELCMP-12388 Signed-off-by: Aditya Bisoi <abisoi@redhat.com>
This commit is contained in:
Aditya Bisoi
lsedlar
parent
8cf1d98312
commit
b513c8cd00
11 changed files with 4 additions and 357 deletions
|
|
@ -473,70 +473,6 @@ class TestBuildinstallPhase(PungiTestCase):
|
|||
],
|
||||
)
|
||||
|
||||
@mock.patch("pungi.phases.buildinstall.ThreadPool")
|
||||
@mock.patch("pungi.phases.buildinstall.LoraxWrapper")
|
||||
@mock.patch("pungi.phases.buildinstall.get_volid")
|
||||
def test_starts_threads_for_each_cmd_with_buildinstall(
|
||||
self, get_volid, loraxCls, poolCls
|
||||
):
|
||||
compose = BuildInstallCompose(
|
||||
self.topdir,
|
||||
{
|
||||
"bootable": True,
|
||||
"release_name": "Test",
|
||||
"release_short": "t",
|
||||
"release_version": "1",
|
||||
"buildinstall_method": "buildinstall",
|
||||
"disc_types": {"dvd": "DVD"},
|
||||
},
|
||||
)
|
||||
|
||||
get_volid.return_value = "vol_id"
|
||||
|
||||
phase = BuildinstallPhase(compose, self._make_pkgset_phase(["p1"]))
|
||||
|
||||
phase.run()
|
||||
|
||||
# Two items added for processing in total.
|
||||
pool = poolCls.return_value
|
||||
self.assertEqual(2, len(pool.queue_put.mock_calls))
|
||||
|
||||
# Obtained correct lorax commands.
|
||||
six.assertCountEqual(
|
||||
self,
|
||||
loraxCls.return_value.get_buildinstall_cmd.mock_calls,
|
||||
[
|
||||
mock.call(
|
||||
"Test",
|
||||
"1",
|
||||
"1",
|
||||
[self.topdir + "/work/x86_64/repo/p1"],
|
||||
self.topdir + "/work/x86_64/buildinstall",
|
||||
buildarch="x86_64",
|
||||
is_final=True,
|
||||
volid="vol_id",
|
||||
),
|
||||
mock.call(
|
||||
"Test",
|
||||
"1",
|
||||
"1",
|
||||
[self.topdir + "/work/amd64/repo/p1"],
|
||||
self.topdir + "/work/amd64/buildinstall",
|
||||
buildarch="amd64",
|
||||
is_final=True,
|
||||
volid="vol_id",
|
||||
),
|
||||
],
|
||||
)
|
||||
six.assertCountEqual(
|
||||
self,
|
||||
get_volid.mock_calls,
|
||||
[
|
||||
mock.call(compose, "x86_64", disc_type="DVD"),
|
||||
mock.call(compose, "amd64", disc_type="DVD"),
|
||||
],
|
||||
)
|
||||
|
||||
@mock.patch("pungi.phases.buildinstall.get_file")
|
||||
@mock.patch("pungi.phases.buildinstall.ThreadPool")
|
||||
@mock.patch("pungi.phases.buildinstall.LoraxWrapper")
|
||||
|
|
@ -1400,142 +1336,6 @@ class BuildinstallThreadTestCase(PungiTestCase):
|
|||
],
|
||||
)
|
||||
|
||||
@mock.patch("pungi.phases.buildinstall.link_boot_iso")
|
||||
@mock.patch("pungi.phases.buildinstall.tweak_buildinstall")
|
||||
@mock.patch("pungi.wrappers.kojiwrapper.KojiWrapper")
|
||||
@mock.patch("pungi.wrappers.kojiwrapper.get_buildroot_rpms")
|
||||
@mock.patch("pungi.phases.buildinstall.run")
|
||||
def test_buildinstall_thread_with_buildinstall_in_runroot(
|
||||
self, run, get_buildroot_rpms, KojiWrapperMock, mock_tweak, mock_link
|
||||
):
|
||||
compose = BuildInstallCompose(
|
||||
self.topdir,
|
||||
{
|
||||
"buildinstall_method": "buildinstall",
|
||||
"runroot_tag": "rrt",
|
||||
"koji_profile": "koji",
|
||||
"koji_cache": "/tmp",
|
||||
},
|
||||
)
|
||||
|
||||
get_buildroot_rpms.return_value = ["bash", "zsh"]
|
||||
|
||||
get_runroot_cmd = KojiWrapperMock.return_value.get_runroot_cmd
|
||||
|
||||
run_runroot_cmd = KojiWrapperMock.return_value.run_runroot_cmd
|
||||
run_runroot_cmd.return_value = {
|
||||
"output": "Foo bar baz",
|
||||
"retcode": 0,
|
||||
"task_id": 1234,
|
||||
}
|
||||
|
||||
t = BuildinstallThread(self.pool)
|
||||
|
||||
with mock.patch("time.sleep"):
|
||||
pkgset_phase = self._make_pkgset_phase(["p1"])
|
||||
t.process((compose, "amd64", None, self.cmd, pkgset_phase), 0)
|
||||
|
||||
destdir = os.path.join(self.topdir, "work/amd64/buildinstall")
|
||||
self.assertEqual(
|
||||
get_runroot_cmd.mock_calls,
|
||||
[
|
||||
mock.call(
|
||||
"rrt",
|
||||
"amd64",
|
||||
self.cmd,
|
||||
channel=None,
|
||||
use_shell=True,
|
||||
packages=["anaconda"],
|
||||
mounts=[self.topdir],
|
||||
weight=None,
|
||||
chown_paths=[destdir],
|
||||
)
|
||||
],
|
||||
)
|
||||
self.assertEqual(
|
||||
run_runroot_cmd.mock_calls,
|
||||
[
|
||||
mock.call(
|
||||
get_runroot_cmd.return_value,
|
||||
log_file=self.topdir + "/logs/amd64/buildinstall.amd64.log",
|
||||
)
|
||||
],
|
||||
)
|
||||
with open(self.topdir + "/logs/amd64/buildinstall-RPMs.amd64.log") as f:
|
||||
rpms = f.read().strip().split("\n")
|
||||
six.assertCountEqual(self, rpms, ["bash", "zsh"])
|
||||
six.assertCountEqual(self, self.pool.finished_tasks, [(None, "amd64")])
|
||||
six.assertCountEqual(
|
||||
self,
|
||||
mock_tweak.call_args_list,
|
||||
[
|
||||
mock.call(
|
||||
compose,
|
||||
destdir,
|
||||
os.path.join(self.topdir, "compose", var, "amd64/os"),
|
||||
"amd64",
|
||||
var,
|
||||
"",
|
||||
"dummy-volid",
|
||||
self.pool.kickstart_file,
|
||||
)
|
||||
for var in ["Client", "Server"]
|
||||
],
|
||||
)
|
||||
six.assertCountEqual(
|
||||
self,
|
||||
mock_link.call_args_list,
|
||||
[
|
||||
mock.call(compose, "amd64", compose.variants["Client"], False),
|
||||
mock.call(compose, "amd64", compose.variants["Server"], False),
|
||||
],
|
||||
)
|
||||
|
||||
@mock.patch("pungi.wrappers.kojiwrapper.KojiWrapper")
|
||||
@mock.patch("pungi.wrappers.kojiwrapper.get_buildroot_rpms")
|
||||
@mock.patch("pungi.phases.buildinstall.run")
|
||||
def test_buildinstall_fail_exit_code(
|
||||
self, run, get_buildroot_rpms, KojiWrapperMock
|
||||
):
|
||||
compose = BuildInstallCompose(
|
||||
self.topdir,
|
||||
{
|
||||
"buildinstall_method": "buildinstall",
|
||||
"runroot_tag": "rrt",
|
||||
"koji_profile": "koji",
|
||||
"koji_cache": "/tmp",
|
||||
"failable_deliverables": [("^.+$", {"*": ["buildinstall"]})],
|
||||
},
|
||||
)
|
||||
|
||||
get_buildroot_rpms.return_value = ["bash", "zsh"]
|
||||
|
||||
run_runroot_cmd = KojiWrapperMock.return_value.run_runroot_cmd
|
||||
run_runroot_cmd.return_value = {
|
||||
"output": "Foo bar baz",
|
||||
"retcode": 1,
|
||||
"task_id": 1234,
|
||||
}
|
||||
|
||||
t = BuildinstallThread(self.pool)
|
||||
|
||||
with mock.patch("time.sleep"):
|
||||
pkgset_phase = self._make_pkgset_phase(["p1"])
|
||||
t.process((compose, "x86_64", None, self.cmd, pkgset_phase), 0)
|
||||
|
||||
compose._logger.error.assert_has_calls(
|
||||
[
|
||||
mock.call(
|
||||
"[FAIL] Buildinstall (variant None, arch x86_64) failed, but going on anyway." # noqa: E501
|
||||
),
|
||||
mock.call(
|
||||
"Runroot task failed: 1234. See %s/logs/x86_64/buildinstall.x86_64.log for more details." # noqa: E501
|
||||
% self.topdir
|
||||
),
|
||||
]
|
||||
)
|
||||
self.assertEqual(self.pool.finished_tasks, set())
|
||||
|
||||
@mock.patch("pungi.wrappers.kojiwrapper.KojiWrapper")
|
||||
@mock.patch("pungi.wrappers.kojiwrapper.get_buildroot_rpms")
|
||||
@mock.patch("pungi.phases.buildinstall.run")
|
||||
|
|
|
|||
|
|
@ -223,22 +223,6 @@ class BuildinstallConfigTestCase(ConfigTestCase):
|
|||
|
||||
self.assertValidation(cfg, [])
|
||||
|
||||
def test_buildinstall_with_lorax_options(self):
|
||||
cfg = load_config(
|
||||
PKGSET_REPOS,
|
||||
buildinstall_method="buildinstall",
|
||||
lorax_options=[("^Server$", {})],
|
||||
)
|
||||
|
||||
self.assertValidation(
|
||||
cfg,
|
||||
[
|
||||
checks.CONFLICTS.format(
|
||||
"buildinstall_method", "buildinstall", "lorax_options"
|
||||
)
|
||||
],
|
||||
)
|
||||
|
||||
def test_lorax_with_lorax_options(self):
|
||||
cfg = load_config(PKGSET_REPOS, buildinstall_method="lorax", lorax_options=[])
|
||||
|
||||
|
|
|
|||
|
|
@ -267,58 +267,6 @@ class CreateIsoScriptTest(helpers.PungiTestCase):
|
|||
]
|
||||
)
|
||||
|
||||
def test_bootable_run_buildinstall(self):
|
||||
createiso.write_script(
|
||||
createiso.CreateIsoOpts(
|
||||
output_dir=self.outdir,
|
||||
iso_name="DP-1.0-20160405.t.3-ppc64.iso",
|
||||
volid="DP-1.0-20160405.t.3",
|
||||
graft_points="graft-list",
|
||||
arch="ppc64",
|
||||
buildinstall_method="buildinstall",
|
||||
),
|
||||
self.out,
|
||||
)
|
||||
|
||||
self.assertScript(
|
||||
[
|
||||
" ".join(
|
||||
[
|
||||
"/usr/bin/genisoimage",
|
||||
"-untranslated-filenames",
|
||||
"-volid",
|
||||
"DP-1.0-20160405.t.3",
|
||||
"-J",
|
||||
"-joliet-long",
|
||||
"-rational-rock",
|
||||
"-translation-table",
|
||||
"-x",
|
||||
"./lost+found",
|
||||
"-part",
|
||||
"-hfs",
|
||||
"-r",
|
||||
"-l",
|
||||
"-sysid",
|
||||
"PPC",
|
||||
"-no-desktop",
|
||||
"-allow-multidot",
|
||||
"-chrp-boot",
|
||||
"-map",
|
||||
"/usr/lib/anaconda-runtime/boot/mapping",
|
||||
"-hfs-bless",
|
||||
"/ppc/mac",
|
||||
"-o",
|
||||
"DP-1.0-20160405.t.3-ppc64.iso",
|
||||
"-graft-points",
|
||||
"-path-list",
|
||||
"graft-list",
|
||||
]
|
||||
),
|
||||
" ".join(["/usr/bin/implantisomd5", "DP-1.0-20160405.t.3-ppc64.iso"]),
|
||||
"isoinfo -R -f -i DP-1.0-20160405.t.3-ppc64.iso | grep -v '/TRANS.TBL$' | sort >> DP-1.0-20160405.t.3-ppc64.iso.manifest", # noqa: E501
|
||||
]
|
||||
)
|
||||
|
||||
@mock.patch("sys.stderr")
|
||||
@mock.patch("kobo.shortcuts.run")
|
||||
def test_run_with_jigdo_bad_args(self, run, stderr):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue