diff --git a/.gitignore b/.gitignore index 339e98c..1f6494c 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /copr-backend-git-12.a045d5a.tar.gz /copr-backend-1.114.tar.gz /copr-backend-git-22.68db19e.tar.gz +/copr-backend-1.115.tar.gz diff --git a/0001-frontend-backend-fix-268.patch b/0001-frontend-backend-fix-268.patch deleted file mode 100644 index 075d9da..0000000 --- a/0001-frontend-backend-fix-268.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 05d47a81a9cfe451c52bf5520c9abb3cdc799f19 Mon Sep 17 00:00:00 2001 -From: clime -Date: Fri, 23 Mar 2018 09:45:54 +0100 -Subject: [PATCH] [frontend][backend] fix #268 - -* custom method seems to pick ppc64le builders even though fedora-latest-x86_64 requested ---- - backend/job.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/backend/job.py b/backend/job.py -index 0bd9e767..2e8ad2e8 100644 ---- a/backend/job.py -+++ b/backend/job.py -@@ -67,7 +67,8 @@ class BuildJob(object): - - if self.chroot: - self.arch = self.chroot.split("-")[2] -- else: -+ -+ if str(self.task_id) == str(self.build_id): - self.chroot = 'srpm-builds' - - self.destdir = os.path.normpath(os.path.join( --- -2.14.3 - diff --git a/copr-backend.spec b/copr-backend.spec index 108e2db..c9324f9 100644 --- a/copr-backend.spec +++ b/copr-backend.spec @@ -3,18 +3,18 @@ %endif Name: copr-backend -Version: 1.114 -Release: 2.git.22.68db19e%{?dist} +Version: 1.115 +Release: 1%{?dist} Summary: Backend for Copr License: GPLv2+ URL: https://pagure.io/copr/copr -# Source is created by +# Source is created by: # git clone https://pagure.io/copr/copr.git +# git checkout copr-backend-1.115 # cd copr/backend -# tito build --tgz -Source0: copr-backend-git-22.68db19e.tar.gz -Patch0: 0001-frontend-backend-fix-268.patch +# rpkg spec --sources +Source0: copr-backend-1.115.tar.gz BuildArch: noarch BuildRequires: asciidoc @@ -94,9 +94,7 @@ This package include documentation for COPR code. Mostly useful for developers only. %prep -%setup -q -n copr-backend-git-22.68db19e -%patch0 -p1 - +%setup -q %build @@ -222,6 +220,15 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr %exclude %{_pkgdocdir}/playbooks %changelog +* Thu Apr 26 2018 Dominik Turecek 1.115-1 +- rpkg deployment into COPR - containers + releng continuation +- fix pagure bugs #269, #273, #221 and #268 +- cleanup in test_helpers, one test added +- change order of args in StrictRedis call +- add comment about expected usage of the copr_log_hitcounter script +- try to send hit data to frontend several times from +copr_log_hitcounter + * Mon Feb 26 2018 clime 1.114-1 - add possibility for copr_log_hitcounter to ignore multiple subnets diff --git a/sources b/sources index 95d7d3d..61e921a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (copr-backend-git-22.68db19e.tar.gz) = be1d76535371483ee7de04ce6b2919d4fff252a1afd8b5533dc26ee1f4ba9abd560da6e154dfe140f3eae7b2059ab28df1720c116f3ff54707d0b06397a5e0af +SHA512 (copr-backend-1.115.tar.gz) = 2ec65b42310e4393b15d591a24ae3e4b576d9dad852672ccacd5aaa9095ed30e5c1837f839f82f0667b43b933ebb41a513395038a70480bf658d468a8835ebf6