From 0197def83eb083dac0571510719bdbdea6fbebe8 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 22 Jul 2016 11:11:54 -0400 Subject: [PATCH 1/4] Remove koji from requirements.txt so that jenkins will fly. --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f3b58350..c7c2581a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,3 @@ fedmsg modulemd pyOpenSSL kobo -koji From 4edada2e15cbc1ca237c00a7bc7ec4690a4c839c Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 22 Jul 2016 11:18:46 -0400 Subject: [PATCH 2/4] Try to get tests working again for jenkins... --- rida/scheduler/handlers/modules.py | 2 +- tests/test_scheduler/test_modules/test_init.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rida/scheduler/handlers/modules.py b/rida/scheduler/handlers/modules.py index 4e4d4191..b3c7bb2a 100644 --- a/rida/scheduler/handlers/modules.py +++ b/rida/scheduler/handlers/modules.py @@ -52,7 +52,7 @@ def init(config, session, msg): log.debug("Received module_info=%s from pdc" % module_info) tag = rida.pdc.get_module_tag(pdc, module_info) - log.info("Found tag=%s for module %s-%s-%s" % (tag, build['name'], build['version'], build['release'])) + log.info("Found tag=%s for module %s-%s-%s" % (tag, build.name, build.version, build.release)) dependencies = rida.pdc.get_module_dependencies(pdc, module_info) builder = rida.builder.KojiModuleBuilder(build.name, config) diff --git a/tests/test_scheduler/test_modules/test_init.py b/tests/test_scheduler/test_modules/test_init.py index 294e1be8..9ca15c7b 100644 --- a/tests/test_scheduler/test_modules/test_init.py +++ b/tests/test_scheduler/test_modules/test_init.py @@ -35,7 +35,7 @@ class TestInit(unittest.TestCase): @mock.patch('rida.builder.KojiModuleBuilder') @mock.patch('rida.database.ModuleBuild.from_fedmsg') - @mock.patch('rida.pdc.get_pdc_client_session') + @mock.patch('rida.pdc') def test_init_basic(self, pdc, from_fedmsg, KojiModuleBuilder): builder = mock.Mock() KojiModuleBuilder.return_value = builder @@ -45,6 +45,11 @@ class TestInit(unittest.TestCase): 'version': 1, } from_fedmsg.return_value = mocked_module_build + pdc.get_module.return_value = { + 'name': 'foo', + 'version': 1, + 'release': 1, + } msg = { 'topic': 'org.fedoraproject.prod.rida.module.state.change', From 87c9ff085c67d5bf8ca0a8aa07dee0247ad54fc7 Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Mon, 25 Jul 2016 15:08:27 +0200 Subject: [PATCH 3/4] typo: rida.logging -> rida.logger --- rida/scheduler/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rida/scheduler/main.py b/rida/scheduler/main.py index 5ff770fa..73208dbc 100644 --- a/rida/scheduler/main.py +++ b/rida/scheduler/main.py @@ -36,7 +36,7 @@ import os import threading import rida.config -import rida.logging +import rida.logger import rida.messaging import rida.scheduler.handlers.modules #import rida.scheduler.handlers.builds @@ -132,7 +132,7 @@ class Polling(threading.Thread): def main(): - rida.logging.init_logging(config) + rida.logger.init_logging(config) log.info("Starting ridad.") try: messaging_thread = Messaging() From 98d8b54c6195165f5b72cc09bc255e3b1219f843 Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Mon, 25 Jul 2016 17:33:04 +0200 Subject: [PATCH 4/4] rida.conf: add new modularity pdc instance as a default pdc url --- rida.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rida.conf b/rida.conf index e7d4c84e..94e0a1e4 100644 --- a/rida.conf +++ b/rida.conf @@ -4,7 +4,7 @@ messaging = fedmsg koji_config = /etc/rida/koji.conf koji_profile = koji db = sqlite:///rida.db -pdc_url = http://fed-mod.org:8000/rest_api/v1 +pdc_url = http://modularity.fedorainfracloud.org:8080/rest_api/v1 pdc_insecure = True pdc_develop = True scmurls = ["git://pkgs.stg.fedoraproject.org/modules/"]