diff --git a/conf/config.py b/conf/config.py index 0b4b4f85..117d29ed 100644 --- a/conf/config.py +++ b/conf/config.py @@ -32,7 +32,7 @@ class BaseConfiguration(object): KOJI_REPOSITORY_URL = 'https://kojipkgs.fedoraproject.org/repos' KOJI_TAG_PREFIXES = ['module'] KOJI_ENABLE_CONTENT_GENERATOR = True - PDC_CHECK_FOR_EOL = False + CHECK_FOR_EOL = False PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1' PDC_INSECURE = False PDC_DEVELOP = True diff --git a/module_build_service/config.py b/module_build_service/config.py index 63165b72..494ab0b1 100644 --- a/module_build_service/config.py +++ b/module_build_service/config.py @@ -159,7 +159,7 @@ class Config(object): 'type': str, 'default': 'https://mbs.fedoraproject.org/module-build-service/1/module-builds/', 'desc': 'MBS instance url for MBSResolver'}, - 'pdc_check_for_eol': { + 'check_for_eol': { 'type': bool, 'default': False, 'desc': 'Flag to determine whether or not MBS should block EOL modules from building.'}, diff --git a/module_build_service/utils/submit.py b/module_build_service/utils/submit.py index 9b0bfbdb..d2bcec9e 100644 --- a/module_build_service/utils/submit.py +++ b/module_build_service/utils/submit.py @@ -489,7 +489,7 @@ def _fetch_mmd(url, branch=None, allow_local_url=False, whitelist_url=False): "Failed to remove temporary directory {!r}: {}".format( td, str(e))) - if conf.pdc_check_for_eol: + if conf.check_for_eol: if _is_eol_in_pdc(scm.name, scm.branch): raise ValidationError( 'Module {}:{} is marked as EOL in PDC.'.format(scm.name, scm.branch)) diff --git a/tests/test_build/test_build.py b/tests/test_build/test_build.py index 4122afbc..0603d6e0 100644 --- a/tests/test_build/test_build.py +++ b/tests/test_build/test_build.py @@ -414,7 +414,7 @@ class TestBuild: # Make sure the build is done assert module_build.state == models.BUILD_STATES['ready'] - @patch('module_build_service.config.Config.pdc_check_for_eol', + @patch('module_build_service.config.Config.check_for_eol', new_callable=PropertyMock, return_value=True) @patch('module_build_service.utils.submit._is_eol_in_pdc', return_value=True) @patch('module_build_service.auth.get_user', return_value=user)