From e01f69cbd13345deb47d140f36ab4ff2033f54ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 22:07:41 +0000 Subject: [PATCH 01/18] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- module-build-service.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/module-build-service.spec b/module-build-service.spec index d3b3c6e..a93e405 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service Version: 1.3.25 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Module Build Service for Modularity @@ -219,6 +219,9 @@ done %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.3.25-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Jul 17 2017 Jan Kaluza - 1.3.25-3 - fix typo in spec file From 90f3f4c375509d25665bc8215a2b663f0d9069eb Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 11 Aug 2017 17:05:50 -0400 Subject: [PATCH 02/18] Require mock-scm for local builds. --- module-build-service.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/module-build-service.spec b/module-build-service.spec index a93e405..e381671 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service Version: 1.3.25 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Module Build Service for Modularity @@ -118,6 +118,9 @@ Requires: python-qpid Requires: python-openidc-client Requires: python-urlgrabber +# https://bugzilla.redhat.com/show_bug.cgi?id=1466792 +Requires: mock-scm + %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-flask-sqlalchemy Requires: python-flask-migrate @@ -219,6 +222,9 @@ done %changelog +* Fri Aug 11 2017 Ralph Bean - 1.3.25-5 +- Require mock-scm for local builds. + * Wed Jul 26 2017 Fedora Release Engineering - 1.3.25-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From e03859aac5fa817a7a920c20b201575d56de9517 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Thu, 17 Aug 2017 11:13:28 +0200 Subject: [PATCH 03/18] new version 1.3.26 --- .gitignore | 1 + module-build-service.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e5900dd..5cf571b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /module-build-service-1.3.23.tar.gz /module-build-service-1.3.24.tar.gz /module-build-service-1.3.25.tar.gz +/module-build-service-1.3.26.tar.gz diff --git a/module-build-service.spec b/module-build-service.spec index e381671..470b922 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service -Version: 1.3.25 -Release: 5%{?dist} +Version: 1.3.26 +Release: 1%{?dist} Summary: The Module Build Service for Modularity @@ -189,7 +189,7 @@ rm -f module_build_service/.mbs_local_build.db export PYTHONPATH=%{buildroot}%{python2_sitelib} mkdir -p %{buildroot}/%{_mandir}/man1 for command in mbs-manager mbs-frontend mbs-gencert mbs-upgradedb ; do -MBS_CONFIG_FILE=conf/config.py %{buildroot}/%{_bindir}/$command || true +MBS_CONFIG_FILE=conf/config.py %{buildroot}/%{_bindir}/$command --help || true MBS_CONFIG_FILE=conf/config.py help2man -N --version-string=%{version} \ %{buildroot}/%{_bindir}/$command > \ %{buildroot}/%{_mandir}/man1/$command.1 @@ -222,6 +222,9 @@ done %changelog +* Thu Aug 17 2017 Jan Kaluza - 1.3.26-1 +- new version + * Fri Aug 11 2017 Ralph Bean - 1.3.25-5 - Require mock-scm for local builds. diff --git a/sources b/sources index 5b05427..9b90f26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-1.3.25.tar.gz) = d04810cdff3f3476eeadd5339543a7000f562652a518733b4b05bd292c4acebc444a8fe73ce306605fbfc03b219d782bbb04d3a9c27dad9ed44b91b216867b8e +SHA512 (module-build-service-1.3.26.tar.gz) = a0c1117fc22239bc0bd837a38116816c0f27474eb345fd61ecf0635062c727861f3430f0b943facc07241b19e205011efd03ce64d9eef545d27a25c601e726ee From ff2cdbf562bf1fc3dc2b355f5a7d1ec427eb5f1c Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Thu, 17 Aug 2017 12:18:53 +0200 Subject: [PATCH 04/18] Add python2-dogpile-cache to BuildRequires. --- module-build-service.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/module-build-service.spec b/module-build-service.spec index 470b922..a931d94 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -33,6 +33,7 @@ BuildRequires: kobo-rpmlib BuildRequires: m2crypto BuildRequires: mock BuildRequires: python2-pdc-client +BuildRequires: python2-dogpile-cache BuildRequires: python-fedora BuildRequires: python-flask-script BuildRequires: python-httplib2 From 800f69133128b1f405c07a9faad6ecd098a0a2f3 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Thu, 17 Aug 2017 14:56:12 +0200 Subject: [PATCH 05/18] fix mbs-build issue with trailing slash in REST API url --- mbs-build-trailing-slash.patch | 13 +++++++++++++ module-build-service.spec | 9 +++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 mbs-build-trailing-slash.patch diff --git a/mbs-build-trailing-slash.patch b/mbs-build-trailing-slash.patch new file mode 100644 index 0000000..45ba48d --- /dev/null +++ b/mbs-build-trailing-slash.patch @@ -0,0 +1,13 @@ +diff --git a/contrib/mbs-build b/contrib/mbs-build +index 9e4e030..d4d0593 100755 +--- a/contrib/mbs-build ++++ b/contrib/mbs-build +@@ -21,7 +21,7 @@ except ImportError: + + DEFAULT_ID_PROVIDER = "https://id.fedoraproject.org/openidc/" + DEFAULT_MBS_SERVER = "https://mbs.fedoraproject.org" +-DEFAULT_MBS_REST_API = "/module-build-service/1/module-builds" ++DEFAULT_MBS_REST_API = "/module-build-service/1/module-builds/" + DEFAULT_KOJI_TASK_URL = "https://koji.fedoraproject.org/koji/taskinfo" + + openidc_client.WEB_PORTS = [13747] diff --git a/module-build-service.spec b/module-build-service.spec index a931d94..5e117e6 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service Version: 1.3.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Module Build Service for Modularity @@ -11,6 +11,7 @@ Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{vers %if 0%{?rhel} && 0%{?rhel} <= 7 Patch0: mbs-no-mbsbuild.patch %endif +Patch1: mbs-build-trailing-slash.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -174,6 +175,8 @@ for a number of tasks: %patch0 -p1 %endif +%patch1 -p1 + # Simply remove an old .pyc file that was included in one release. rm -f module_build_service/scheduler/consumer.pyc # And this weird sqlite file that made it in... @@ -221,8 +224,10 @@ done %exclude %{python2_sitelib}/conf/ %exclude %{python2_sitelib}/tests/ - %changelog +* Thu Aug 17 2017 Jan Kaluza - 1.3.26-2 +- fix mbs-build issue with trailing slash in REST API url + * Thu Aug 17 2017 Jan Kaluza - 1.3.26-1 - new version From c1ef5c1132d9e38966fddc3a9161086613f6dffe Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Fri, 18 Aug 2017 07:57:29 +0200 Subject: [PATCH 06/18] add missing dependency on python2-dogpile-cache --- module-build-service.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module-build-service.spec b/module-build-service.spec index 5e117e6..ca717c5 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service Version: 1.3.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Module Build Service for Modularity @@ -119,6 +119,7 @@ Requires: rpm-build Requires: python-qpid Requires: python-openidc-client Requires: python-urlgrabber +Requires: python2-dogpile-cache # https://bugzilla.redhat.com/show_bug.cgi?id=1466792 Requires: mock-scm @@ -225,6 +226,9 @@ done %exclude %{python2_sitelib}/tests/ %changelog +* Fri Aug 18 2017 Jan Kaluza - 1.3.26-3 +- add missing dependency on python2-dogpile-cache + * Thu Aug 17 2017 Jan Kaluza - 1.3.26-2 - fix mbs-build issue with trailing slash in REST API url From 73bd16676e2a94fa4b108b770798e63a08830b1b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 3 Sep 2017 13:32:41 +0200 Subject: [PATCH 07/18] make tab/space mess consistent Signed-off-by: Igor Gnatenko --- module-build-service.spec | 226 +++++++++++++++++++------------------- 1 file changed, 113 insertions(+), 113 deletions(-) diff --git a/module-build-service.spec b/module-build-service.spec index ca717c5..3b27a39 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,155 +1,155 @@ -Name: module-build-service -Version: 1.3.26 -Release: 3%{?dist} -Summary: The Module Build Service for Modularity +Name: module-build-service +Version: 1.3.26 +Release: 3%{?dist} +Summary: The Module Build Service for Modularity -Group: Development/Tools -License: MIT -URL: https://pagure.io/fm-orchestrator -Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz +Group: Development/Tools +License: MIT +URL: https://pagure.io/fm-orchestrator +Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz %if 0%{?rhel} && 0%{?rhel} <= 7 -Patch0: mbs-no-mbsbuild.patch +Patch0: mbs-no-mbsbuild.patch %endif -Patch1: mbs-build-trailing-slash.patch +Patch1: mbs-build-trailing-slash.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from # rhel7-extras which is only available on x86_64 for now. -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: %{ix86} x86_64 %else -BuildArch: noarch +BuildArch: noarch %endif -BuildRequires: python2-devel +BuildRequires: python2-devel -BuildRequires: python2-mock -BuildRequires: python-vcrpy -BuildRequires: fedmsg -BuildRequires: git -BuildRequires: help2man -BuildRequires: kobo -BuildRequires: kobo-rpmlib +BuildRequires: python2-mock +BuildRequires: python-vcrpy +BuildRequires: fedmsg +BuildRequires: git +BuildRequires: help2man +BuildRequires: kobo +BuildRequires: kobo-rpmlib -BuildRequires: m2crypto -BuildRequires: mock -BuildRequires: python2-pdc-client -BuildRequires: python2-dogpile-cache -BuildRequires: python-fedora -BuildRequires: python-flask-script -BuildRequires: python-httplib2 -BuildRequires: python-m2ext -BuildRequires: python-munch -BuildRequires: python-six -BuildRequires: python2-funcsigs -BuildRequires: python2-modulemd >= 1.1.0 -BuildRequires: rpm-build -BuildRequires: python-qpid -BuildRequires: python-openidc-client -BuildRequires: python-urlgrabber +BuildRequires: m2crypto +BuildRequires: mock +BuildRequires: python2-pdc-client +BuildRequires: python2-dogpile-cache +BuildRequires: python-fedora +BuildRequires: python-flask-script +BuildRequires: python-httplib2 +BuildRequires: python-m2ext +BuildRequires: python-munch +BuildRequires: python-six +BuildRequires: python2-funcsigs +BuildRequires: python2-modulemd >= 1.1.0 +BuildRequires: rpm-build +BuildRequires: python-qpid +BuildRequires: python-openidc-client +BuildRequires: python-urlgrabber %if (0%{?fedora} && 0%{?fedora} <= 26) || (0%{?rhel} && 0%{?rhel} <= 7) -BuildRequires: koji +BuildRequires: koji %else -BuildRequires: python2-koji +BuildRequires: python2-koji %endif %if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: python-setuptools -BuildRequires: python-flask-sqlalchemy -BuildRequires: python-flask-migrate -BuildRequires: python-nose -BuildRequires: python-mock -BuildRequires: python-six -BuildRequires: pyOpenSSL -BuildRequires: python-sqlalchemy -BuildRequires: python-futures -BuildRequires: python-flask -BuildRequires: systemd-python +BuildRequires: python-setuptools +BuildRequires: python-flask-sqlalchemy +BuildRequires: python-flask-migrate +BuildRequires: python-nose +BuildRequires: python-mock +BuildRequires: python-six +BuildRequires: pyOpenSSL +BuildRequires: python-sqlalchemy +BuildRequires: python-futures +BuildRequires: python-flask +BuildRequires: systemd-python %else -BuildRequires: python2-setuptools -BuildRequires: python2-flask-sqlalchemy -BuildRequires: python2-flask-migrate -BuildRequires: python2-nose -BuildRequires: python2-mock -BuildRequires: python2-tabulate -BuildRequires: python2-six -BuildRequires: python2-futures -BuildRequires: python2-flask -BuildRequires: python2-systemd +BuildRequires: python2-setuptools +BuildRequires: python2-flask-sqlalchemy +BuildRequires: python2-flask-migrate +BuildRequires: python2-nose +BuildRequires: python2-mock +BuildRequires: python2-tabulate +BuildRequires: python2-six +BuildRequires: python2-futures +BuildRequires: python2-flask +BuildRequires: python2-systemd %if (0%{?fedora} && 0%{?fedora} <= 25) || (0%{?rhel} && 0%{?rhel} <= 7) -BuildRequires: pyOpenSSL -BuildRequires: python-sqlalchemy +BuildRequires: pyOpenSSL +BuildRequires: python-sqlalchemy %else -BuildRequires: python2-pyOpenSSL -BuildRequires: python2-sqlalchemy +BuildRequires: python2-pyOpenSSL +BuildRequires: python2-sqlalchemy %endif %endif -BuildRequires: systemd +BuildRequires: systemd %{?systemd_requires} %if (0%{?fedora} && 0%{?fedora} <= 26) || (0%{?rhel} && 0%{?rhel} <= 7) -Requires: koji +Requires: koji %else -Requires: python2-koji +Requires: python2-koji %endif -Requires: systemd -Requires: fedmsg -Requires: fedmsg-hub -Requires: fedpkg -Requires: git -Requires: kobo -Requires: kobo-rpmlib -Requires: m2crypto -Requires: mock -Requires: python2-pdc-client -Requires: pyOpenSSL -Requires: python-fedora -Requires: python-flask-script -Requires: python-httplib2 -Requires: python-m2ext -Requires: python-munch -Requires: python2-funcsigs -Requires: python2-modulemd >= 1.1.0 -Requires: rpm-build -Requires: python-qpid -Requires: python-openidc-client -Requires: python-urlgrabber -Requires: python2-dogpile-cache +Requires: systemd +Requires: fedmsg +Requires: fedmsg-hub +Requires: fedpkg +Requires: git +Requires: kobo +Requires: kobo-rpmlib +Requires: m2crypto +Requires: mock +Requires: python2-pdc-client +Requires: pyOpenSSL +Requires: python-fedora +Requires: python-flask-script +Requires: python-httplib2 +Requires: python-m2ext +Requires: python-munch +Requires: python2-funcsigs +Requires: python2-modulemd >= 1.1.0 +Requires: rpm-build +Requires: python-qpid +Requires: python-openidc-client +Requires: python-urlgrabber +Requires: python2-dogpile-cache # https://bugzilla.redhat.com/show_bug.cgi?id=1466792 -Requires: mock-scm +Requires: mock-scm %if 0%{?rhel} && 0%{?rhel} <= 7 -Requires: python-flask-sqlalchemy -Requires: python-flask-migrate -Requires: python-mock -Requires: python-six -Requires: pyOpenSSL -Requires: python-sqlalchemy -Requires: python-futures -Requires: python-flask -Requires: systemd-python +Requires: python-flask-sqlalchemy +Requires: python-flask-migrate +Requires: python-mock +Requires: python-six +Requires: pyOpenSSL +Requires: python-sqlalchemy +Requires: python-futures +Requires: python-flask +Requires: systemd-python %else -Requires: python2-flask-sqlalchemy -Requires: python2-flask-migrate -Requires: python2-mock -Requires: python2-systemd -Requires: python2-six -Requires: python2-futures -Requires: python2-flask -Requires: python2-tabulate +Requires: python2-flask-sqlalchemy +Requires: python2-flask-migrate +Requires: python2-mock +Requires: python2-systemd +Requires: python2-six +Requires: python2-futures +Requires: python2-flask +Requires: python2-tabulate %if (0%{?fedora} && 0%{?fedora} <= 25) || (0%{?rhel} && 0%{?rhel} <= 7) -Requires: pyOpenSSL -Requires: python-sqlalchemy +Requires: pyOpenSSL +Requires: python-sqlalchemy %else -Requires: python2-pyOpenSSL -Requires: python2-sqlalchemy +Requires: python2-pyOpenSSL +Requires: python2-sqlalchemy %endif %endif @@ -196,8 +196,8 @@ mkdir -p %{buildroot}/%{_mandir}/man1 for command in mbs-manager mbs-frontend mbs-gencert mbs-upgradedb ; do MBS_CONFIG_FILE=conf/config.py %{buildroot}/%{_bindir}/$command --help || true MBS_CONFIG_FILE=conf/config.py help2man -N --version-string=%{version} \ - %{buildroot}/%{_bindir}/$command > \ - %{buildroot}/%{_mandir}/man1/$command.1 + %{buildroot}/%{_bindir}/$command > \ + %{buildroot}/%{_mandir}/man1/$command.1 done From 145335061769aa3d414574395b262439fda2d908 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 3 Sep 2017 13:35:36 +0200 Subject: [PATCH 08/18] don't add python-six multiple times Signed-off-by: Igor Gnatenko --- module-build-service.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/module-build-service.spec b/module-build-service.spec index 3b27a39..286f2e3 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -40,7 +40,6 @@ BuildRequires: python-flask-script BuildRequires: python-httplib2 BuildRequires: python-m2ext BuildRequires: python-munch -BuildRequires: python-six BuildRequires: python2-funcsigs BuildRequires: python2-modulemd >= 1.1.0 BuildRequires: rpm-build From 09c13a8015a5a451ec9dfff7d720f6bb480ef1d5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 3 Sep 2017 13:35:59 +0200 Subject: [PATCH 09/18] remove unreachable conditions Signed-off-by: Igor Gnatenko --- module-build-service.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module-build-service.spec b/module-build-service.spec index 286f2e3..8af370a 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -77,7 +77,7 @@ BuildRequires: python2-futures BuildRequires: python2-flask BuildRequires: python2-systemd -%if (0%{?fedora} && 0%{?fedora} <= 25) || (0%{?rhel} && 0%{?rhel} <= 7) +%if 0%{?fedora} && 0%{?fedora} <= 25 BuildRequires: pyOpenSSL BuildRequires: python-sqlalchemy %else @@ -143,7 +143,7 @@ Requires: python2-futures Requires: python2-flask Requires: python2-tabulate -%if (0%{?fedora} && 0%{?fedora} <= 25) || (0%{?rhel} && 0%{?rhel} <= 7) +%if 0%{?fedora} && 0%{?fedora} <= 25 Requires: pyOpenSSL Requires: python-sqlalchemy %else From 168914fdba787ebbee36f74a4c6981609f86c98e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 3 Sep 2017 13:36:10 +0200 Subject: [PATCH 10/18] there is python2-koji on all releases Signed-off-by: Igor Gnatenko --- module-build-service.spec | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/module-build-service.spec b/module-build-service.spec index 8af370a..307c8ed 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -47,11 +47,7 @@ BuildRequires: python-qpid BuildRequires: python-openidc-client BuildRequires: python-urlgrabber -%if (0%{?fedora} && 0%{?fedora} <= 26) || (0%{?rhel} && 0%{?rhel} <= 7) -BuildRequires: koji -%else BuildRequires: python2-koji -%endif %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: python-setuptools @@ -90,12 +86,6 @@ BuildRequires: python2-sqlalchemy BuildRequires: systemd %{?systemd_requires} -%if (0%{?fedora} && 0%{?fedora} <= 26) || (0%{?rhel} && 0%{?rhel} <= 7) -Requires: koji -%else -Requires: python2-koji -%endif - Requires: systemd Requires: fedmsg Requires: fedmsg-hub @@ -120,6 +110,8 @@ Requires: python-openidc-client Requires: python-urlgrabber Requires: python2-dogpile-cache +Requires: python2-koji + # https://bugzilla.redhat.com/show_bug.cgi?id=1466792 Requires: mock-scm From beae0b1fb0dcb05faef4d374efc7371ddaf689fe Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 3 Sep 2017 13:36:51 +0200 Subject: [PATCH 11/18] remove unneeded systemd_requires macro Signed-off-by: Igor Gnatenko --- module-build-service.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/module-build-service.spec b/module-build-service.spec index 307c8ed..206847e 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -84,7 +84,6 @@ BuildRequires: python2-sqlalchemy %endif BuildRequires: systemd -%{?systemd_requires} Requires: systemd Requires: fedmsg From 96774f2d33b967d695b5c86718b67f74e424e3b4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 3 Sep 2017 13:39:36 +0200 Subject: [PATCH 12/18] simplufy %prep section Signed-off-by: Igor Gnatenko --- module-build-service.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/module-build-service.spec b/module-build-service.spec index 206847e..7d68f94 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -168,12 +168,6 @@ for a number of tasks: %patch1 -p1 -# Simply remove an old .pyc file that was included in one release. -rm -f module_build_service/scheduler/consumer.pyc -# And this weird sqlite file that made it in... -rm -f module_build_service/.mbs_local_build.db - - %build %py2_build From 0ef2bea4724325d4d1ffc870dc4f1d427e2a51cb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 3 Sep 2017 13:40:35 +0200 Subject: [PATCH 13/18] include all patches. always. This was violation of guidelines. Signed-off-by: Igor Gnatenko --- module-build-service.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/module-build-service.spec b/module-build-service.spec index 7d68f94..8aa4c74 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -8,9 +8,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 -%if 0%{?rhel} && 0%{?rhel} <= 7 Patch0: mbs-no-mbsbuild.patch -%endif Patch1: mbs-build-trailing-slash.patch %if 0%{?rhel} && 0%{?rhel} <= 7 From a9153cf5e92425166799164cb578d7cd6171df6d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 3 Sep 2017 13:49:44 +0200 Subject: [PATCH 14/18] update %check section Signed-off-by: Igor Gnatenko --- module-build-service.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module-build-service.spec b/module-build-service.spec index 8aa4c74..5708b51 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -183,9 +183,9 @@ MBS_CONFIG_FILE=conf/config.py help2man -N --version-string=%{version} \ done -# Still failing https://pagure.io/fm-orchestrator/issue/381 -#%check -#nosetests-2.7 -v +%check +# https://pagure.io/fm-orchestrator/issue/664 +#nosetests-%{python2_version} -v %files From 96759dafa369ed8f667bc795bb719c1d6c762b8f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 3 Sep 2017 13:52:21 +0200 Subject: [PATCH 15/18] backport few patches to fix skiptests behavior Signed-off-by: Igor Gnatenko --- ...skiptests-is-not-positional-argument.patch | 27 ++++++++++++++++ ...ilding-packages-when-tests-are-skipp.patch | 32 +++++++++++++++++++ module-build-service.spec | 4 +++ 3 files changed, 63 insertions(+) create mode 100644 0001-manager-skiptests-is-not-positional-argument.patch create mode 100644 0001-utils-unbreak-building-packages-when-tests-are-skipp.patch diff --git a/0001-manager-skiptests-is-not-positional-argument.patch b/0001-manager-skiptests-is-not-positional-argument.patch new file mode 100644 index 0000000..539e194 --- /dev/null +++ b/0001-manager-skiptests-is-not-positional-argument.patch @@ -0,0 +1,27 @@ +From 99a6c03507e496df67c9f2eecd0585e891fb0ad4 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Sun, 3 Sep 2017 13:20:37 +0200 +Subject: [PATCH] manager: skiptests is not positional argument + +mbs-build adds --skiptests option, but mbs-manager thinks that skiptests +is positional argument. + +Fixes: aac4227eb83b8146487c415fee4267d22baad506 +Signed-off-by: Igor Gnatenko +--- + module_build_service/manage.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/module_build_service/manage.py b/module_build_service/manage.py +index 2e76424..e915f7d 100755 +--- a/module_build_service/manage.py ++++ b/module_build_service/manage.py +@@ -118,7 +118,7 @@ def cleardb(): + + @manager.option('branch') + @manager.option('url') +-@manager.option('skiptests', action='store_true') ++@manager.option('--skiptests', action='store_true') + @manager.option('-l', '--add-local-build', action='append', default=None, dest='local_build_nsvs') + def build_module_locally(url, branch, local_build_nsvs=None, skiptests=False): + """ Performs local module build using Mock diff --git a/0001-utils-unbreak-building-packages-when-tests-are-skipp.patch b/0001-utils-unbreak-building-packages-when-tests-are-skipp.patch new file mode 100644 index 0000000..2b47227 --- /dev/null +++ b/0001-utils-unbreak-building-packages-when-tests-are-skipp.patch @@ -0,0 +1,32 @@ +From ee1176f444571f98132393c65e800d1c128831f7 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Sun, 3 Sep 2017 12:22:11 +0200 +Subject: [PATCH] utils: unbreak building packages when tests are skipped +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Just replacing %check macro is ¤&%¤#%&¤%¤. I'm not going to +add any more words on it. + +It breaks building many packages. + +Fixes: 5391e7c9afb709a5bed0d920d0cc9e346537976c +Signed-off-by: Igor Gnatenko +--- + module_build_service/utils.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/module_build_service/utils.py b/module_build_service/utils.py +index 9d6d173..70dbe14 100644 +--- a/module_build_service/utils.py ++++ b/module_build_service/utils.py +@@ -908,7 +908,7 @@ def submit_module_build_from_scm(username, url, branch, allow_local_url=False, + url = "file://" + url + mmd, scm, yaml = _fetch_mmd(url, branch, allow_local_url) + if skiptests: +- mmd.buildopts.rpms.macros += "\n\n%check exit 0\n" ++ mmd.buildopts.rpms.macros += "\n\n%__spec_check_pre exit 0\n" + return submit_module_build(username, url, mmd, scm, yaml, optional_params) + + diff --git a/module-build-service.spec b/module-build-service.spec index 5708b51..6c91ee6 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -10,6 +10,10 @@ 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-build-trailing-slash.patch +# https://pagure.io/fm-orchestrator/pull-request/662 +Patch2: 0001-utils-unbreak-building-packages-when-tests-are-skipp.patch +# https://pagure.io/fm-orchestrator/pull-request/663 +Patch3: 0001-manager-skiptests-is-not-positional-argument.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from From 1eec79eaeac94827a7ecdc3ce82eadd87a1f706f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 3 Sep 2017 13:53:48 +0200 Subject: [PATCH 16/18] bump release Signed-off-by: Igor Gnatenko --- module-build-service.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module-build-service.spec b/module-build-service.spec index 6c91ee6..eec36f7 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service Version: 1.3.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The Module Build Service for Modularity @@ -212,6 +212,10 @@ done %exclude %{python2_sitelib}/tests/ %changelog +* Sun Sep 03 2017 Igor Gnatenko - 1.3.26-4 +- Backport patches to fix skiptests behavior +- Cleanups / Fixes in spec + * Fri Aug 18 2017 Jan Kaluza - 1.3.26-3 - add missing dependency on python2-dogpile-cache From 0c0708db8ba8d36b83348cbdf972c0e64f7fe522 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 5 Sep 2017 10:44:42 +0200 Subject: [PATCH 17/18] Really apply patches Signed-off-by: Igor Gnatenko --- 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 eec36f7..2aabdad 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service Version: 1.3.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Module Build Service for Modularity @@ -169,6 +169,8 @@ for a number of tasks: %endif %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %py2_build @@ -212,6 +214,9 @@ done %exclude %{python2_sitelib}/tests/ %changelog +* Tue Sep 05 2017 Igor Gnatenko - 1.3.26-5 +- Really apply patches + * Sun Sep 03 2017 Igor Gnatenko - 1.3.26-4 - Backport patches to fix skiptests behavior - Cleanups / Fixes in spec From 1cee0103fe3a24f4d3950e8e636d0bce1221618d Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 12 Sep 2017 14:01:16 -0400 Subject: [PATCH 18/18] 1.3.27 --- .gitignore | 1 + ...skiptests-is-not-positional-argument.patch | 27 ---------------- ...ilding-packages-when-tests-are-skipp.patch | 32 ------------------- mbs-build-trailing-slash.patch | 13 -------- module-build-service.spec | 15 +++------ sources | 2 +- 6 files changed, 7 insertions(+), 83 deletions(-) delete mode 100644 0001-manager-skiptests-is-not-positional-argument.patch delete mode 100644 0001-utils-unbreak-building-packages-when-tests-are-skipp.patch delete mode 100644 mbs-build-trailing-slash.patch diff --git a/.gitignore b/.gitignore index 5cf571b..8cec86b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /module-build-service-1.3.24.tar.gz /module-build-service-1.3.25.tar.gz /module-build-service-1.3.26.tar.gz +/module-build-service-1.3.27.tar.gz diff --git a/0001-manager-skiptests-is-not-positional-argument.patch b/0001-manager-skiptests-is-not-positional-argument.patch deleted file mode 100644 index 539e194..0000000 --- a/0001-manager-skiptests-is-not-positional-argument.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 99a6c03507e496df67c9f2eecd0585e891fb0ad4 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sun, 3 Sep 2017 13:20:37 +0200 -Subject: [PATCH] manager: skiptests is not positional argument - -mbs-build adds --skiptests option, but mbs-manager thinks that skiptests -is positional argument. - -Fixes: aac4227eb83b8146487c415fee4267d22baad506 -Signed-off-by: Igor Gnatenko ---- - module_build_service/manage.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/module_build_service/manage.py b/module_build_service/manage.py -index 2e76424..e915f7d 100755 ---- a/module_build_service/manage.py -+++ b/module_build_service/manage.py -@@ -118,7 +118,7 @@ def cleardb(): - - @manager.option('branch') - @manager.option('url') --@manager.option('skiptests', action='store_true') -+@manager.option('--skiptests', action='store_true') - @manager.option('-l', '--add-local-build', action='append', default=None, dest='local_build_nsvs') - def build_module_locally(url, branch, local_build_nsvs=None, skiptests=False): - """ Performs local module build using Mock diff --git a/0001-utils-unbreak-building-packages-when-tests-are-skipp.patch b/0001-utils-unbreak-building-packages-when-tests-are-skipp.patch deleted file mode 100644 index 2b47227..0000000 --- a/0001-utils-unbreak-building-packages-when-tests-are-skipp.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ee1176f444571f98132393c65e800d1c128831f7 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sun, 3 Sep 2017 12:22:11 +0200 -Subject: [PATCH] utils: unbreak building packages when tests are skipped -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Just replacing %check macro is ¤&%¤#%&¤%¤. I'm not going to -add any more words on it. - -It breaks building many packages. - -Fixes: 5391e7c9afb709a5bed0d920d0cc9e346537976c -Signed-off-by: Igor Gnatenko ---- - module_build_service/utils.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/module_build_service/utils.py b/module_build_service/utils.py -index 9d6d173..70dbe14 100644 ---- a/module_build_service/utils.py -+++ b/module_build_service/utils.py -@@ -908,7 +908,7 @@ def submit_module_build_from_scm(username, url, branch, allow_local_url=False, - url = "file://" + url - mmd, scm, yaml = _fetch_mmd(url, branch, allow_local_url) - if skiptests: -- mmd.buildopts.rpms.macros += "\n\n%check exit 0\n" -+ mmd.buildopts.rpms.macros += "\n\n%__spec_check_pre exit 0\n" - return submit_module_build(username, url, mmd, scm, yaml, optional_params) - - diff --git a/mbs-build-trailing-slash.patch b/mbs-build-trailing-slash.patch deleted file mode 100644 index 45ba48d..0000000 --- a/mbs-build-trailing-slash.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/contrib/mbs-build b/contrib/mbs-build -index 9e4e030..d4d0593 100755 ---- a/contrib/mbs-build -+++ b/contrib/mbs-build -@@ -21,7 +21,7 @@ except ImportError: - - DEFAULT_ID_PROVIDER = "https://id.fedoraproject.org/openidc/" - DEFAULT_MBS_SERVER = "https://mbs.fedoraproject.org" --DEFAULT_MBS_REST_API = "/module-build-service/1/module-builds" -+DEFAULT_MBS_REST_API = "/module-build-service/1/module-builds/" - DEFAULT_KOJI_TASK_URL = "https://koji.fedoraproject.org/koji/taskinfo" - - openidc_client.WEB_PORTS = [13747] diff --git a/module-build-service.spec b/module-build-service.spec index 2aabdad..364571d 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service -Version: 1.3.26 -Release: 5%{?dist} +Version: 1.3.27 +Release: 1%{?dist} Summary: The Module Build Service for Modularity @@ -9,11 +9,6 @@ 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-build-trailing-slash.patch -# https://pagure.io/fm-orchestrator/pull-request/662 -Patch2: 0001-utils-unbreak-building-packages-when-tests-are-skipp.patch -# https://pagure.io/fm-orchestrator/pull-request/663 -Patch3: 0001-manager-skiptests-is-not-positional-argument.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -168,9 +163,6 @@ for a number of tasks: %patch0 -p1 %endif -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %py2_build @@ -214,6 +206,9 @@ done %exclude %{python2_sitelib}/tests/ %changelog +* Tue Sep 12 2017 Ralph Bean - 1.3.27-1 +- new version + * Tue Sep 05 2017 Igor Gnatenko - 1.3.26-5 - Really apply patches diff --git a/sources b/sources index 9b90f26..d94ae8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-1.3.26.tar.gz) = a0c1117fc22239bc0bd837a38116816c0f27474eb345fd61ecf0635062c727861f3430f0b943facc07241b19e205011efd03ce64d9eef545d27a25c601e726ee +SHA512 (module-build-service-1.3.27.tar.gz) = 1c447fc999559d2ac4d9b4526e91fa19989943d59822ef543e269350ceaf71e5bf5d00247982f48d0eee04d1f92865426966a2eea7f4734df7ea050c432ac364