February 2016 - copr-commits - Fedora Mailing-Lists

[copr] master: 1307239 - fix typo (0315b35)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 0315b355d8dc4c8786b7a470c9d8d8f8fc1cfb0a Author: Miroslav Such�� <msuchy(a)redhat.com> Date: Mon Feb 15 10:24:46 2016 +0100 1307239 - fix typo >--------------------------------------------------------------- .../coprs/templates/coprs/_coprs_forms.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html b/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html index 72a74a1..d71349e 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/_coprs_forms.html @@ -38,9 +38,9 @@ {% endif %} {{ render_field(form.description, rows=5, cols=50, placeholder='Optional - describe your project briefly.', - info='You can use <a href="http://daringfireball.net/projects/markdown/syntax">markdown syntax</a>, inline HTMLis forbidden.') }} + info='You can use <a href="http://daringfireball.net/projects/markdown/syntax">markdown syntax</a>, inline HTML is forbidden.') }} - {{ render_field(form.instructions, rows=5, cols=50, placeholder='Optional - describe how your project can be installed. Where users can report bugs and issues. Link to wiki is good as well.', info='You can use <a href="http://daringfireball.net/projects/markdown/syntax">markdown syntax</a>, inline HTMLis forbidden.') }} + {{ render_field(form.instructions, rows=5, cols=50, placeholder='Optional - describe how your project can be installed. Where users can report bugs and issues. Link to wiki is good as well.', info='You can use <a href="http://daringfireball.net/projects/markdown/syntax">markdown syntax</a>, inline HTML is forbidden.') }} {{ render_field(form.homepage, label='Homepage', placeholder='Optional - project homepage') }} {{ render_field(form.contact, label='Contact', placeholder='Optional - email address or contact url', info="Use e-mail address or a link to your issue tracker. This information will be shown publicly.") }}

8 years, 2 months

1
0
0 / 0

[copr] master: Revert "this is no needed any more" (9ae56c1)

by clime＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 9ae56c10da11832c9f1d60fd353584fe2d8f020d Author: clime <clime(a)redhat.com> Date: Mon Feb 15 10:03:26 2016 +0100 Revert "this is no needed any more" This reverts commit 695fdf1c1d8dae436b45363ba914788b3964717d. >--------------------------------------------------------------- .tito/packages/prunerepo | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.tito/packages/prunerepo b/.tito/packages/prunerepo new file mode 100644 index 0000000..526e302 --- /dev/null +++ b/.tito/packages/prunerepo @@ -0,0 +1 @@ +1.3-1 prunerepo/

8 years, 2 months

1
0
0 / 0

[copr] tag 'copr-selinux-1.39-1' created

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git New tag : copr-selinux-1.39-1 Referencing: 0f4801414f62d2bfc0e575672d6c52d523654afa

8 years, 2 months

1
0
0 / 0

[copr] master: Automatic commit of package [copr-selinux] release [1.39-1]. (f718ea3)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit f718ea3d37d624437f7d6218db9ffaac945d02a0 Author: Miroslav Such�� <msuchy(a)redhat.com> Date: Fri Feb 12 14:40:10 2016 +0100 Automatic commit of package [copr-selinux] release [1.39-1]. >--------------------------------------------------------------- .tito/packages/copr-selinux | 2 +- selinux/copr-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.tito/packages/copr-selinux b/.tito/packages/copr-selinux index c44f853..aed77d5 100644 --- a/.tito/packages/copr-selinux +++ b/.tito/packages/copr-selinux @@ -1 +1 @@ -1.38-1 selinux/ +1.39-1 selinux/ diff --git a/selinux/copr-selinux.spec b/selinux/copr-selinux.spec index 3ff2283..6c3a780 100644 --- a/selinux/copr-selinux.spec +++ b/selinux/copr-selinux.spec @@ -8,7 +8,7 @@ %{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' %{_datadir}/selinux/devel/policyhelp 2>/dev/null)} Name: copr-selinux -Version: 1.38 +Version: 1.39 Release: 1%{?dist} Summary: SELinux module for COPR @@ -111,6 +111,9 @@ fi %dir %{_datadir}/selinux/mls %changelog +* Fri Feb 12 2016 Miroslav Such�� <msuchy(a)redhat.com> 1.39-1 +- allow copr-dist-git to read dist-git + * Wed Feb 03 2016 Miroslav Such�� <msuchy(a)redhat.com> 1.38-1 - add rules for dist-git and keygen

8 years, 2 months

1
0
0 / 0

[copr] master: allow copr-dist-git to read dist-git (a19d970)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit a19d97068404619dcaf2100306f77c845d842fb6 Author: Miroslav Such�� <msuchy(a)redhat.com> Date: Fri Feb 12 14:39:36 2016 +0100 allow copr-dist-git to read dist-git >--------------------------------------------------------------- selinux/copr.te | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/selinux/copr.te b/selinux/copr.te index 4b8512c..cf9e68d 100644 --- a/selinux/copr.te +++ b/selinux/copr.te @@ -26,3 +26,10 @@ allow httpd_t copr_data_t:file { rename write getattr read create open lock unli allow httpd_t copr_httpd_log_t:file { rename write getattr read create open lock unlink }; allow httpd_t copr_httpd_log_t:dir { write getattr read remove_name open add_name create search}; + +# dist-git +allow git_script_t git_user_content_t:lnk_file read; +allow httpd_t git_user_content_t:dir read; +allow httpd_t git_user_content_t:file { getattr read open }; +allow syslogd_t auditd_log_t:dir search; +allow syslogd_t auditd_log_t:file { read getattr open ioctl };

8 years, 2 months

1
0
0 / 0

[copr] chain-builds: [frontend][dist-git][backend] chain builds - initial draft, mostly backend still needs some work (6f04c65)

by clime＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : chain-builds >--------------------------------------------------------------- commit 6f04c65680a14896e0fe25525e5860af0aa32bc2 Author: clime <clime(a)redhat.com> Date: Thu Feb 11 10:51:15 2016 +0100 [frontend][dist-git][backend] chain builds - initial draft, mostly backend still needs some work >--------------------------------------------------------------- Diff suppressed because of size. To see it, use: git diff --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol ^6f04c65680a14896e0fe25525e5860af0aa32bc2~1 6f04c65680a14896e0fe25525e5860af0aa32bc2

8 years, 2 months

1
0
0 / 0

[copr] branch 'chain-builds' created

by clime＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/copr.git New branch : chain-builds Referencing: 6f04c65680a14896e0fe25525e5860af0aa32bc2

8 years, 2 months

1
0
0 / 0

[copr] master: [frontend] always print button for package rebuild Disabled links does not work in all browsers (i.e. Konqueror) and it can be confusing. Rather redirect to package settings in case of missing default source. (13c606f)

by frostyx＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 13c606f72e6aba4ed81b3ce9077754372cba3119 Author: Jakub Kadl��k <jkadlcik(a)redhat.com> Date: Mon Feb 8 14:21:21 2016 +0100 [frontend] always print button for package rebuild Disabled links does not work in all browsers (i.e. Konqueror) and it can be confusing. Rather redirect to package settings in case of missing default source. >--------------------------------------------------------------- .../templates/coprs/detail/_packages_table.html | 4 ++-- .../coprs/templates/coprs/detail/package.html | 2 -- .../coprs/views/coprs_ns/coprs_packages.py | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/_packages_table.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/_packages_table.html index f725ee6..184e041 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/detail/_packages_table.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/_packages_table.html @@ -51,9 +51,9 @@ <td> {% if g.user and g.user.can_build_in(copr) %} <a class="btn btn-default btn-sm" - {% if not package.source_type %}disabled="disabled"{% endif %} href="{{ copr_url('coprs_ns.copr_rebuild_package', copr, package_name=package.name) }}"> - <span class="pficon pficon-restart"></span> Rebuild </a> + <span class="{% if package.source_type %}pficon pficon-restart{% else %}fa fa-wrench{% endif %}"></span> Rebuild + </a> {% else %} - {% endif %} diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/package.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/package.html index 8f7f088..e5cc5a3 100644 --- a/frontend/coprs_frontend/coprs/templates/coprs/detail/package.html +++ b/frontend/coprs_frontend/coprs/templates/coprs/detail/package.html @@ -18,11 +18,9 @@ {% block detail_body %} -{% if package.source_type %} <a class="btn btn-default pull-right button-build-action" href="{{ copr_url('coprs_ns.copr_rebuild_package', copr, package_name=package.name) }}"> <span class="pficon pficon-restart"></span> Rebuild </a> -{% endif %} <h2 class="page-title"> Package: {{ package.name }} </h2> diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_packages.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_packages.py index 8036387..9ca1ed3 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_packages.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_packages.py @@ -47,6 +47,10 @@ def copr_rebuild_package(copr, package_name): form = forms.BuildFormMockFactory f = render_add_build_mock view_suffix = "_mock" + else: + flask.flash("Package {} has not the default source which is required for rebuild. Please configure some source" + .format(package_name, copr.full_name)) + return flask.redirect(copr_url("coprs_ns.copr_edit_package", copr, package_name=package_name)) form = form(copr.active_chroots)(data=data) return f(copr, form, view="coprs_ns.copr_new_build" + view_suffix, package=package)

8 years, 2 months

1
0
0 / 0

[copr] master: [frontend][backend] specify rawhide name when calling rawhide_to_release (8098aea)

by frostyx＠fedoraproject.org

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 8098aeafed40a1fb9895387b616db7c166e5d885 Author: Jakub Kadl��k <jkadlcik(a)redhat.com> Date: Wed Feb 3 11:39:41 2016 +0100 [frontend][backend] specify rawhide name when calling rawhide_to_release >--------------------------------------------------------------- backend/backend/actions.py | 31 ++++++-------- copr-setup.txt | 3 +- frontend/coprs_frontend/manage.py | 82 +++++++++++++++++++++---------------- 3 files changed, 63 insertions(+), 53 deletions(-) diff --git a/backend/backend/actions.py b/backend/backend/actions.py index 9135f77..8048c15 100644 --- a/backend/backend/actions.py +++ b/backend/backend/actions.py @@ -234,23 +234,20 @@ class Action(object): def handle_rawhide_to_release(self, result): data = json.loads(self.data["data"]) - - for chroot in data["chroots"]: - rawhide_chroot = "fedora-rawhide-{}".format(chroot.split("-")[-1]) - try: - chrootdir = os.path.join(self.opts.destdir, data["user"], data["copr"], chroot) - if not os.path.exists(chrootdir): - self.log.debug("Create directory: {}".format(chrootdir)) - os.makedirs(chrootdir) - - for build in data["builds"]: - srcdir = os.path.join(self.opts.destdir, data["user"], data["copr"], rawhide_chroot, build) - if os.path.exists(srcdir): - destdir = os.path.join(chrootdir, build) - self.log.debug("Copy directory: {} as {}".format(srcdir, destdir)) - shutil.copytree(srcdir, destdir) - except: - result.result = ActionResult.FAILURE + try: + chrootdir = os.path.join(self.opts.destdir, data["user"], data["copr"], data["dest_chroot"]) + if not os.path.exists(chrootdir): + self.log.debug("Create directory: {}".format(chrootdir)) + os.makedirs(chrootdir) + + for build in data["builds"]: + srcdir = os.path.join(self.opts.destdir, data["user"], data["copr"], data["rawhide_chroot"], build) + if os.path.exists(srcdir): + destdir = os.path.join(chrootdir, build) + self.log.debug("Copy directory: {} as {}".format(srcdir, destdir)) + shutil.copytree(srcdir, destdir) + except: + result.result = ActionResult.FAILURE result.result = ActionResult.SUCCESS diff --git a/copr-setup.txt b/copr-setup.txt index f854ed9..59c90f7 100644 --- a/copr-setup.txt +++ b/copr-setup.txt @@ -155,7 +155,8 @@ First create new chroots: And then copy data from rawhide into them: - python manage.py rawhide_to_release fedora-24-i386 fedora-24-x86_64 + python manage.py rawhide_to_release fedora-rawhide-i386 fedora-24-i386 + # similarly for fedora-24-x86_64 DEBUGING ======== diff --git a/frontend/coprs_frontend/manage.py b/frontend/coprs_frontend/manage.py index acd2373..a28b4e2 100755 --- a/frontend/coprs_frontend/manage.py +++ b/frontend/coprs_frontend/manage.py @@ -121,48 +121,60 @@ class CreateChrootCommand(ChrootCommand): self.print_already_exists(chroot_name) -class RawhideToReleaseCommand(ChrootCommand): +class RawhideToReleaseCommand(Command): - def run(self, chroot_names): - for chroot_name in chroot_names: - mock_chroot = coprs_logic.MockChrootsLogic.get_from_name(chroot_name).first() - if not mock_chroot: - print("Given chroot does not exist. Please run:") - print(" sudo python manage.py create_chroot {}".format(chroot_name)) - print("Nothing was committed, rolling back") - return - - for copr in coprs_logic.CoprsLogic.get_all(): - if not self.has_rawhide(copr): - continue - - data = {"copr": copr.name, - "user": copr.owner.name, - "chroots": chroot_names, - "builds": []} - - for package in packages_logic.PackagesLogic.get_all(copr.id): - last_build = package.last_build(successful=True) - if last_build: - data["builds"].append("{}-{}".format(str(last_build.id).zfill(8), package.name)) - - if len(data["builds"]): - actions_logic.ActionsLogic.send_rawhide_to_release(data) - self.turn_on_the_chroot_for_copr(copr, mock_chroot) + option_list = ( + Option("rawhide_chroot", help="Rawhide chroot name, e.g. fedora-rawhide-x86_64."), + Option("dest_chroot", help="Destination chroot, e.g. fedora-24-x86_64."), + ) + + def run(self, rawhide_chroot, dest_chroot): + mock_chroot = coprs_logic.MockChrootsLogic.get_from_name(dest_chroot).first() + if not mock_chroot: + print("Given chroot does not exist. Please run:") + print(" sudo python manage.py create_chroot {}".format(dest_chroot)) + return + + mock_rawhide_chroot = coprs_logic.MockChrootsLogic.get_from_name(rawhide_chroot).first() + if not mock_rawhide_chroot: + print("Given rawhide chroot does not exist. Didnt you mistyped?:") + print(" {}".format(rawhide_chroot)) + return + + for copr in coprs_logic.CoprsLogic.get_all(): + if not self.has_rawhide(copr): + continue + + data = {"copr": copr.name, + "user": copr.owner.name, + "rawhide_chroot": rawhide_chroot, + "dest_chroot": dest_chroot, + "builds": []} + + for package in packages_logic.PackagesLogic.get_all(copr.id): + last_build = package.last_build(successful=True) + if last_build: + data["builds"].append("{}-{}".format(str(last_build.id).zfill(8), package.name)) + + if len(data["builds"]): + actions_logic.ActionsLogic.send_rawhide_to_release(data) + self.turn_on_the_chroot_for_copr(copr, rawhide_chroot, mock_chroot) db.session.commit() - def turn_on_the_chroot_for_copr(self, copr, mock_chroot): - rawhide_chroot = coprs_logic.CoprChrootsLogic.\ - get_by_name_safe(copr, "fedora-rawhide-{}".format(mock_chroot.name.split("-")[-1])) + def turn_on_the_chroot_for_copr(self, copr, rawhide_name, mock_chroot): + rawhide_chroot = coprs_logic.CoprChrootsLogic.get_by_name_safe(copr, rawhide_name) + dest_chroot = coprs_logic.CoprChrootsLogic.get_by_name_safe(copr, mock_chroot.name) - if not rawhide_chroot or coprs_logic.CoprChrootsLogic.get_by_name_safe(copr, mock_chroot.name): + if not rawhide_chroot or dest_chroot: return - coprs_logic.CoprChrootsLogic.create_chroot(copr.owner, copr, mock_chroot, - buildroot_pkgs=rawhide_chroot.buildroot_pkgs, - comps=rawhide_chroot.comps, - comps_name=rawhide_chroot.comps_name) + create_kwargs = { + "buildroot_pkgs": rawhide_chroot.buildroot_pkgs, + "comps": rawhide_chroot.comps, + "comps_name": rawhide_chroot.comps_name, + } + coprs_logic.CoprChrootsLogic.create_chroot(copr.owner, copr, mock_chroot, **create_kwargs) def has_rawhide(self, copr): return any(filter(lambda ch: ch.os_version == "rawhide", copr.mock_chroots))

8 years, 2 months

1
0
0 / 0

[copr] master: this is no needed any more (695fdf1)

by Miroslav Suchý

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master >--------------------------------------------------------------- commit 695fdf1c1d8dae436b45363ba914788b3964717d Author: Miroslav Such�� <msuchy(a)redhat.com> Date: Wed Feb 3 15:11:08 2016 +0100 this is no needed any more >--------------------------------------------------------------- .tito/packages/prunerepo | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.tito/packages/prunerepo b/.tito/packages/prunerepo deleted file mode 100644 index 526e302..0000000 --- a/.tito/packages/prunerepo +++ /dev/null @@ -1 +0,0 @@ -1.3-1 prunerepo/

8 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

copr-commits February 2016