From dc006fc43ccd587c0620bbb4a3e9f96c0e751aa8 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Fri, 12 May 2017 11:28:39 +0200 Subject: [PATCH 1/6] 1.3.22 --- module-build-service.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/module-build-service.spec b/module-build-service.spec index a2620d0..334f4a6 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,5 +1,5 @@ Name: module-build-service -Version: 1.3.20 +Version: 1.3.22 Release: 1%{?dist} Summary: The Module Build Service for Modularity @@ -7,6 +7,7 @@ Group: Development/Tools License: MIT URL: https://pagure.io/fm-orchestrator Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz +Patch0: mbs-no-mbsbuild.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -115,6 +116,7 @@ for a number of tasks: %prep %setup -q +%patch0 -p1 # Simply remove an old .pyc file that was included in one release. rm -f module_build_service/scheduler/consumer.pyc @@ -164,6 +166,9 @@ done %changelog +* Fri May 12 2017 Jan Kaluza - 1.3.22-1 +- new version + * Fri Apr 07 2017 Jan Kaluza - 1.3.20-1 - new version From e1c712f0af9cf58e0beb2fefc0e276a794c307b9 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Fri, 12 May 2017 11:30:58 +0200 Subject: [PATCH 2/6] Add missing patch --- mbs-no-mbsbuild.patch | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 mbs-no-mbsbuild.patch diff --git a/mbs-no-mbsbuild.patch b/mbs-no-mbsbuild.patch new file mode 100644 index 0000000..c5d571f --- /dev/null +++ b/mbs-no-mbsbuild.patch @@ -0,0 +1,35 @@ +diff --git a/mbs-no-tabulate.patch b/mbs-no-tabulate.patch +index e69de29..78d5927 100644 +--- a/mbs-no-tabulate.patch ++++ b/mbs-no-tabulate.patch +@@ -0,0 +1,9 @@ ++diff --git a/requirements.txt b/requirements.txt ++index 81b8fa1..5281b57 100644 ++--- a/requirements.txt +++++ b/requirements.txt ++@@ -20,4 +20,3 @@ qpid-python ++ six ++ sqlalchemy ++ futures # Python 2 only ++-tabulate +diff --git a/requirements.txt b/requirements.txt +index 81b8fa1..5281b57 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -20,4 +20,3 @@ qpid-python + six + sqlalchemy + futures # Python 2 only +-tabulate +diff --git a/setup.py b/setup.py +index 3d011e3..45bc6f0 100644 +--- a/setup.py ++++ b/setup.py +@@ -31,7 +31,6 @@ setup(name='module-build-service', + 'moksha.consumer': 'mbsconsumer = module_build_service.scheduler.consumer:MBSConsumer', + 'moksha.producer': 'mbspoller = module_build_service.scheduler.producer:MBSProducer', + }, +- scripts=["contrib/mbs-build"], + data_files=[('/etc/module-build-service/', ['conf/cacert.pem', + 'conf/config.py', + 'conf/copr.conf', From 4c81418a962c33ecaff9428f435b1cfe41403733 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Fri, 12 May 2017 11:59:31 +0200 Subject: [PATCH 3/6] Add tarball --- .gitignore | 1 + module-build-service.spec | 1 + sources | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d417051..068f18f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /module-build-service-1.3.18.tar.gz /module-build-service.spec /module-build-service-1.3.20.tar.gz +/module-build-service-1.3.22.tar.gz diff --git a/module-build-service.spec b/module-build-service.spec index 334f4a6..594dd7f 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -3,6 +3,7 @@ Version: 1.3.22 Release: 1%{?dist} Summary: The Module Build Service for Modularity + Group: Development/Tools License: MIT URL: https://pagure.io/fm-orchestrator diff --git a/sources b/sources index 831cf8a..b9ce51a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-1.3.20.tar.gz) = b8f81ae4d0cba44d17965bfecf98251e951d8ce527cccfef943d2eadbf8b3d80e58d74b230fcd968108f60918fb314613c4d1df59daeb391da8f33bef31dddf8 +SHA512 (module-build-service-1.3.22.tar.gz) = 3eb4a24d8d1acec1bce5b8b704ecb1663792502c7437ae54ad4ab8b5e49eacc502d580391ec1c8bfe5b657bf78faa903196b29dc6914b0a9fd6536243c6fd91d From a931b7e6410741c7580522841be98bea4bb102d0 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Tue, 16 May 2017 10:08:55 +0200 Subject: [PATCH 4/6] Fix reusing all components --- module-build-service.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/module-build-service.spec b/module-build-service.spec index 594dd7f..a64962c 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service Version: 1.3.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Module Build Service for Modularity @@ -9,6 +9,7 @@ License: MIT URL: https://pagure.io/fm-orchestrator Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz Patch0: mbs-no-mbsbuild.patch +Patch1: mbs-fix-reuse-all.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -118,6 +119,7 @@ for a number of tasks: %prep %setup -q %patch0 -p1 +%patch1 -p1 # Simply remove an old .pyc file that was included in one release. rm -f module_build_service/scheduler/consumer.pyc @@ -167,6 +169,9 @@ done %changelog +* Tue May 16 2017 Jan Kaluza - 1.3.22-2 +- fix reusing all components + * Fri May 12 2017 Jan Kaluza - 1.3.22-1 - new version From 82db36f84abba9b3d0508048a7cd0a58f5dc1e1b Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Tue, 16 May 2017 10:10:59 +0200 Subject: [PATCH 5/6] Fix reusing all components --- mbs-fix-reuse-all.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 mbs-fix-reuse-all.patch diff --git a/mbs-fix-reuse-all.patch b/mbs-fix-reuse-all.patch new file mode 100644 index 0000000..5e3f6d5 --- /dev/null +++ b/mbs-fix-reuse-all.patch @@ -0,0 +1,16 @@ +diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py +index 04aeaf9..3d13e30 100644 +--- a/module_build_service/scheduler/handlers/modules.py ++++ b/module_build_service/scheduler/handlers/modules.py +@@ -239,8 +239,10 @@ def wait(config, session, msg): + # If all components in module build will be reused, we don't have to build + # module-build-macros, because there won't be any build done. + if attempt_to_reuse_all_components(builder, session, build): +- log.info("All components have ben reused for module %r, " ++ log.info("All components have been reused for module %r, " + "skipping build" % build) ++ build.transition(config, state="build") ++ session.add(build) + session.commit() + return [] + else: From 66e24903ed70f8279e2c8ce88d76a27502664ae0 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Thu, 25 May 2017 11:08:31 +0200 Subject: [PATCH 6/6] use the same spec file for both epel and fedora --- mbs-no-mbsbuild.patch | 14 -------------- module-build-service.spec | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/mbs-no-mbsbuild.patch b/mbs-no-mbsbuild.patch index c5d571f..b5a0f05 100644 --- a/mbs-no-mbsbuild.patch +++ b/mbs-no-mbsbuild.patch @@ -1,17 +1,3 @@ -diff --git a/mbs-no-tabulate.patch b/mbs-no-tabulate.patch -index e69de29..78d5927 100644 ---- a/mbs-no-tabulate.patch -+++ b/mbs-no-tabulate.patch -@@ -0,0 +1,9 @@ -+diff --git a/requirements.txt b/requirements.txt -+index 81b8fa1..5281b57 100644 -+--- a/requirements.txt -++++ b/requirements.txt -+@@ -20,4 +20,3 @@ qpid-python -+ six -+ sqlalchemy -+ futures # Python 2 only -+-tabulate diff --git a/requirements.txt b/requirements.txt index 81b8fa1..5281b57 100644 --- a/requirements.txt diff --git a/module-build-service.spec b/module-build-service.spec index a64962c..e4dd1c4 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service Version: 1.3.22 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Module Build Service for Modularity @@ -8,7 +8,9 @@ Group: Development/Tools License: MIT URL: https://pagure.io/fm-orchestrator Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz -Patch0: mbs-no-mbsbuild.patch +%if 0%{?rhel} && 0%{?rhel} <= 7 +Patch0: mbs-no-mbsbuild.patch +%endif Patch1: mbs-fix-reuse-all.patch %if 0%{?rhel} && 0%{?rhel} <= 7 @@ -46,6 +48,7 @@ BuildRequires: python2-modulemd >= 1.1.0 BuildRequires: rpm-build BuildRequires: python-qpid BuildRequires: python-futures +BuildRequires: python-openidc-client %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: python-setuptools @@ -59,6 +62,7 @@ BuildRequires: python2-flask-sqlalchemy BuildRequires: python2-flask-migrate BuildRequires: python2-nose BuildRequires: python2-mock +BuildRequires: python2-tabulate %endif BuildRequires: systemd @@ -89,6 +93,7 @@ Requires: python2-modulemd >= 1.1.0 Requires: rpm-build Requires: python-qpid Requires: python-futures +Requires: python-openidc-client %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-flask-sqlalchemy @@ -98,6 +103,8 @@ Requires: python-mock Requires: python2-flask-sqlalchemy Requires: python2-flask-migrate Requires: python2-mock +Requires: python2-tabulate +Requires: python2-systemd %endif @@ -118,7 +125,9 @@ for a number of tasks: %prep %setup -q +%if 0%{?rhel} && 0%{?rhel} <= 7 %patch0 -p1 +%endif %patch1 -p1 # Simply remove an old .pyc file that was included in one release. @@ -169,6 +178,9 @@ done %changelog +* Thu May 25 2017 Jan Kaluza - 1.3.22-3 +- Use the same spec file for both epel7 and fedora + * Tue May 16 2017 Jan Kaluza - 1.3.22-2 - fix reusing all components