mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-03-24 22:10:28 +08:00
52e88ba3ff
Currently, we generate `Conflicts` for ursine RPMs conflicting with modular RPMs only when Ursa Prime is used for the base module. This commit changes it, so these Conflicts are generated everytime. The reason is that modular RPMs should always be preferred in the buildroot over the ursine RPMs no matter what is their NVR. So far, this has been guarded on Koji side by using external repos, but we need to move away from external repo or at least use "bare" merge mode which basically means we won't get this feature for free from Koji. The reason why we need to move away from external repos or use "bare" merge mode is that without this, the Koji removes RPMs sharing the same name but different version/release from the buildroot and only keeps the latest one. This is an issue in situation when you need two versions of single RPM in a buildroot comming from two modules.
212 lines
8.8 KiB
Python
212 lines
8.8 KiB
Python
# Copyright (c) 2017 Red Hat, Inc.
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
# of this software and associated documentation files (the "Software"), to deal
|
|
# in the Software without restriction, including without limitation the rights
|
|
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
# copies of the Software, and to permit persons to whom the Software is
|
|
# furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be included in all
|
|
# copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
# SOFTWARE.
|
|
#
|
|
|
|
import os
|
|
|
|
from mock import patch, PropertyMock
|
|
|
|
from tests import conf, clean_database, read_staged_data
|
|
from tests.test_views.test_views import FakeSCM
|
|
import module_build_service.messaging
|
|
import module_build_service.scheduler.handlers.modules
|
|
from module_build_service import build_logs
|
|
from module_build_service.models import make_db_session, ModuleBuild
|
|
from module_build_service.utils.general import mmd_to_str, load_mmd
|
|
|
|
|
|
class TestModuleInit:
|
|
def setup_method(self, test_method):
|
|
self.fn = module_build_service.scheduler.handlers.modules.init
|
|
testmodule_yml_path = read_staged_data("testmodule_init")
|
|
mmd = load_mmd(testmodule_yml_path)
|
|
# Set the name and stream
|
|
mmd = mmd.copy("testmodule", "1")
|
|
scmurl = "git://pkgs.domain.local/modules/testmodule?#620ec77"
|
|
clean_database()
|
|
with make_db_session(conf) as session:
|
|
ModuleBuild.create(
|
|
session, conf, "testmodule", "1", 3, mmd_to_str(mmd), scmurl, "mprahl")
|
|
|
|
def teardown_method(self, test_method):
|
|
try:
|
|
with make_db_session(conf) as db_session:
|
|
path = build_logs.path(db_session, 1)
|
|
os.remove(path)
|
|
except Exception:
|
|
pass
|
|
|
|
@patch(
|
|
"module_build_service.builder.KojiModuleBuilder.KojiModuleBuilder."
|
|
"get_built_rpms_in_module_build"
|
|
)
|
|
@patch("module_build_service.scm.SCM")
|
|
@patch("module_build_service.scheduler.handlers.modules.handle_stream_collision_modules")
|
|
@patch(
|
|
"module_build_service.scheduler.handlers.modules.handle_collisions_with_base_module_rpms"
|
|
)
|
|
@patch("module_build_service.utils.submit.get_build_arches", return_value=["x86_64"])
|
|
def init_basic(self, db_session, get_build_arches, hcwbmr, rscm, mocked_scm, built_rpms):
|
|
FakeSCM(
|
|
mocked_scm,
|
|
"testmodule",
|
|
"testmodule_init.yaml",
|
|
"620ec77321b2ea7b0d67d82992dda3e1d67055b4",
|
|
)
|
|
|
|
built_rpms.return_value = [
|
|
"foo-0:2.4.48-3.el8+1308+551bfa71",
|
|
"foo-debuginfo-0:2.4.48-3.el8+1308+551bfa71",
|
|
"bar-0:2.5.48-3.el8+1308+551bfa71",
|
|
"bar-debuginfo-0:2.5.48-3.el8+1308+551bfa71",
|
|
"x-0:2.5.48-3.el8+1308+551bfa71",
|
|
"x-debuginfo-0:2.5.48-3.el8+1308+551bfa71",
|
|
]
|
|
|
|
platform_build = ModuleBuild.get_by_id(db_session, 1)
|
|
mmd = platform_build.mmd()
|
|
for rpm in mmd.get_rpm_filters():
|
|
mmd.remove_rpm_filter(rpm)
|
|
mmd.add_rpm_filter("foo")
|
|
mmd.add_rpm_filter("bar")
|
|
|
|
platform_build.modulemd = mmd_to_str(mmd)
|
|
db_session.commit()
|
|
|
|
msg = module_build_service.messaging.MBSModule(
|
|
msg_id=None, module_build_id=2, module_build_state="init"
|
|
)
|
|
|
|
self.fn(config=conf, db_session=db_session, msg=msg)
|
|
|
|
build = ModuleBuild.get_by_id(db_session, 2)
|
|
# Make sure the module entered the wait state
|
|
assert build.state == 1, build.state
|
|
# Make sure format_mmd was run properly
|
|
xmd_mbs = build.mmd().get_xmd()["mbs"]
|
|
assert xmd_mbs["buildrequires"]["platform"]["filtered_rpms"] == [
|
|
"foo-0:2.4.48-3.el8+1308+551bfa71",
|
|
"bar-0:2.5.48-3.el8+1308+551bfa71",
|
|
]
|
|
hcwbmr.assert_called_once()
|
|
return build
|
|
|
|
def test_init_called_twice(self, db_session):
|
|
build = self.init_basic(db_session)
|
|
old_component_builds = len(build.component_builds)
|
|
old_mmd = load_mmd(build.modulemd)
|
|
|
|
build.state = 4
|
|
db_session.commit()
|
|
build = self.init_basic(db_session)
|
|
db_session.refresh(build)
|
|
|
|
assert build.state == 1
|
|
assert old_component_builds == len(build.component_builds)
|
|
|
|
new_mmd = load_mmd(build.modulemd)
|
|
# Compare only lengths, because `mmd_to_str` can shuffle the fields randomly.
|
|
assert len(mmd_to_str(old_mmd)) == len(mmd_to_str(new_mmd))
|
|
|
|
@patch("module_build_service.scm.SCM")
|
|
@patch("module_build_service.utils.submit.get_build_arches", return_value=["x86_64"])
|
|
def test_init_scm_not_available(self, get_build_arches, mocked_scm, db_session):
|
|
FakeSCM(
|
|
mocked_scm, "testmodule", "testmodule.yaml", "620ec77321b2ea7b0d67d82992dda3e1d67055b4",
|
|
get_latest_raise=True,
|
|
get_latest_error=RuntimeError("Failed in mocked_scm_get_latest")
|
|
)
|
|
|
|
msg = module_build_service.messaging.MBSModule(
|
|
msg_id=None, module_build_id=2, module_build_state="init")
|
|
self.fn(config=conf, db_session=db_session, msg=msg)
|
|
|
|
build = ModuleBuild.get_by_id(db_session, 2)
|
|
# Make sure the module entered the failed state
|
|
# since the git server is not available
|
|
assert build.state == 4, build.state
|
|
|
|
@patch(
|
|
"module_build_service.config.Config.modules_allow_repository",
|
|
new_callable=PropertyMock,
|
|
return_value=True,
|
|
)
|
|
@patch("module_build_service.scm.SCM")
|
|
@patch("module_build_service.utils.submit.get_build_arches", return_value=["x86_64"])
|
|
def test_init_includedmodule(
|
|
self, get_build_arches, mocked_scm, mocked_mod_allow_repo, db_session
|
|
):
|
|
FakeSCM(mocked_scm, "includedmodules", ["testmodule_init.yaml"])
|
|
includedmodules_yml_path = read_staged_data("includedmodules")
|
|
mmd = load_mmd(includedmodules_yml_path)
|
|
# Set the name and stream
|
|
mmd = mmd.copy("includedmodules", "1")
|
|
scmurl = "git://pkgs.domain.local/modules/includedmodule?#da95886"
|
|
ModuleBuild.create(
|
|
db_session, conf, "includemodule", "1", 3, mmd_to_str(mmd), scmurl, "mprahl")
|
|
msg = module_build_service.messaging.MBSModule(
|
|
msg_id=None, module_build_id=3, module_build_state="init")
|
|
self.fn(config=conf, db_session=db_session, msg=msg)
|
|
build = ModuleBuild.get_by_id(db_session, 3)
|
|
assert build.state == 1
|
|
assert build.name == "includemodule"
|
|
batches = {}
|
|
for comp_build in build.component_builds:
|
|
batches[comp_build.package] = comp_build.batch
|
|
assert batches["perl-List-Compare"] == 2
|
|
assert batches["perl-Tangerine"] == 2
|
|
assert batches["foo"] == 2
|
|
assert batches["tangerine"] == 3
|
|
assert batches["file"] == 4
|
|
# Test that the RPMs are properly merged in xmd
|
|
xmd_rpms = {
|
|
"perl-List-Compare": {"ref": "4f26aeafdb"},
|
|
"perl-Tangerine": {"ref": "4f26aeafdb"},
|
|
"tangerine": {"ref": "4f26aeafdb"},
|
|
"foo": {"ref": "93dea37599"},
|
|
"file": {"ref": "a2740663f8"},
|
|
}
|
|
assert build.mmd().get_xmd()["mbs"]["rpms"] == xmd_rpms
|
|
|
|
@patch("module_build_service.models.ModuleBuild.from_module_event")
|
|
@patch("module_build_service.scm.SCM")
|
|
@patch("module_build_service.utils.submit.get_build_arches", return_value=["x86_64"])
|
|
def test_init_when_get_latest_raises(
|
|
self, get_build_arches, mocked_scm, mocked_from_module_event, db_session):
|
|
FakeSCM(
|
|
mocked_scm,
|
|
"testmodule",
|
|
"testmodule.yaml",
|
|
"7035bd33614972ac66559ac1fdd019ff6027ad22",
|
|
get_latest_raise=True,
|
|
)
|
|
msg = module_build_service.messaging.MBSModule(
|
|
msg_id=None, module_build_id=2, module_build_state="init")
|
|
build = ModuleBuild.get_by_id(db_session, 2)
|
|
mocked_from_module_event.return_value = build
|
|
|
|
self.fn(config=conf, db_session=db_session, msg=msg)
|
|
|
|
# Query the database again to make sure the build object is updated
|
|
db_session.refresh(build)
|
|
# Make sure the module entered the failed state
|
|
assert build.state == 4, build.state
|
|
assert "Failed to get the latest commit for" in build.state_reason
|