mirror of
https://pagure.io/fm-orchestrator.git
synced 2026-04-01 09:50:33 +08:00
bf0bcaff57
Currently, we are using just `conf.arches` and `conf.base_module_arches` to define the list of arches for which the RPMs in a submitted module are built. This is not enough, because RCM needs to generate modules based on the base modules which should use different arches. This commit changes the MBS to take the list of arches from the buildrequired module build. It checks the buildrequires for "privileged" module or base module and if it finds such module, it queries the Koji to find out the list of arches to set for the module. The "privileged" module is a module which can override base module arches or disttag. Previously, these modules have been defined by `allowed_disttag_marking_module_names` config option. In this commit, this has been renamed to `allowed_privileged_module_names`. The list of arches are stored per module build in new table represented by ModuleArch class and are m:n mapped to ModuleBuild.
204 lines
8.8 KiB
Python
204 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
|
|
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, db
|
|
from module_build_service.models import make_session, ModuleBuild, ComponentBuild
|
|
from module_build_service.utils.general import mmd_to_str, load_mmd, load_mmd_file
|
|
|
|
|
|
class TestModuleInit:
|
|
def setup_method(self, test_method):
|
|
self.fn = module_build_service.scheduler.handlers.modules.init
|
|
self.staged_data_dir = os.path.join(os.path.dirname(__file__), "../", "staged_data")
|
|
testmodule_yml_path = os.path.join(self.staged_data_dir, "testmodule_init.yaml")
|
|
mmd = load_mmd_file(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_session(conf) as session:
|
|
ModuleBuild.create(
|
|
session, conf, "testmodule", "1", 3, mmd_to_str(mmd), scmurl, "mprahl")
|
|
|
|
def teardown_method(self, test_method):
|
|
try:
|
|
path = build_logs.path(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.utils.submit.get_build_arches", return_value=["x86_64"])
|
|
def test_init_basic(self, get_build_arches, 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.query.get(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"
|
|
)
|
|
|
|
with make_session(conf) as session:
|
|
self.fn(config=conf, session=session, msg=msg)
|
|
build = ModuleBuild.query.filter_by(id=2).one()
|
|
# 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",
|
|
]
|
|
return build
|
|
|
|
def test_init_called_twice(self):
|
|
build = self.test_init_basic()
|
|
old_component_builds = len(build.component_builds)
|
|
old_mmd = load_mmd(build.modulemd)
|
|
|
|
build.state = 4
|
|
db.session.commit()
|
|
build = self.test_init_basic()
|
|
db.session.refresh(build)
|
|
|
|
assert build.state == 1
|
|
assert old_component_builds == len(build.component_builds)
|
|
|
|
new_mmd = load_mmd(build.modulemd)
|
|
assert mmd_to_str(old_mmd) == 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):
|
|
def mocked_scm_get_latest():
|
|
raise RuntimeError("Failed in mocked_scm_get_latest")
|
|
|
|
FakeSCM(
|
|
mocked_scm, "testmodule", "testmodule.yaml", "620ec77321b2ea7b0d67d82992dda3e1d67055b4")
|
|
mocked_scm.return_value.get_latest = mocked_scm_get_latest
|
|
msg = module_build_service.messaging.MBSModule(
|
|
msg_id=None, module_build_id=2, module_build_state="init")
|
|
with make_session(conf) as session:
|
|
self.fn(config=conf, session=session, msg=msg)
|
|
build = ModuleBuild.query.filter_by(id=2).one()
|
|
# 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):
|
|
FakeSCM(mocked_scm, "includedmodules", ["testmodule_init.yaml"])
|
|
includedmodules_yml_path = os.path.join(self.staged_data_dir, "includedmodules.yaml")
|
|
mmd = load_mmd_file(includedmodules_yml_path)
|
|
# Set the name and stream
|
|
mmd = mmd.copy("includedmodules", "1")
|
|
scmurl = "git://pkgs.domain.local/modules/includedmodule?#da95886"
|
|
with make_session(conf) as session:
|
|
ModuleBuild.create(
|
|
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, session=session, msg=msg)
|
|
build = ModuleBuild.query.filter_by(id=3).one()
|
|
assert build.state == 1
|
|
assert build.name == "includemodule"
|
|
batches = {}
|
|
for comp_build in ComponentBuild.query.filter_by(module_id=3).all():
|
|
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):
|
|
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")
|
|
with make_session(conf) as session:
|
|
build = session.query(ModuleBuild).filter_by(id=2).one()
|
|
mocked_from_module_event.return_value = build
|
|
self.fn(config=conf, session=session, msg=msg)
|
|
# Query the database again to make sure the build object is updated
|
|
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
|