[copr] master: Automatic commit of package [copr-backend] release [1.69-1]. (cb2ff2b)
by vgologuz＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit cb2ff2b9614116dbf18f75a008a739eeff07e8d0
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Mon Jun 1 14:24:35 2015 +0200
Automatic commit of package [copr-backend] release [1.69-1].
>---------------------------------------------------------------
backend/copr-backend.spec | 7 ++++++-
rel-eng/packages/copr-backend | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec
index 6f49836..20e08d3 100644
--- a/backend/copr-backend.spec
+++ b/backend/copr-backend.spec
@@ -3,7 +3,7 @@
%endif
Name: copr-backend
-Version: 1.68
+Version: 1.69
Release: 1%{?dist}
Summary: Backend for Copr
@@ -240,6 +240,11 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
%exclude %{_pkgdocdir}/playbooks
%changelog
+* Mon Jun 01 2015 Valentin Gologuzov <vgologuz(a)redhat.com> 1.69-1
+- removed creation of symlinks for log.gz
+- catch exception during Worker.can_start_job
+- config cleanup
+
* Thu May 28 2015 Valentin Gologuzov <vgologuz(a)redhat.com> 1.68-1
- [backend] add config option for VM health check timeout
- [backend] moved config parameters from Threshold class into the backend
diff --git a/rel-eng/packages/copr-backend b/rel-eng/packages/copr-backend
index 0380abb..97fed14 100644
--- a/rel-eng/packages/copr-backend
+++ b/rel-eng/packages/copr-backend
@@ -1 +1 @@
-1.68-1 backend/
+1.69-1 backend/
8 years, 11 months
[copr] master: [backend] removed creation of symlinks for log.gz (de29bce)
by vgologuz＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit de29bce30d3bb9ac56543c3e034d6e667a56cafb
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Mon Jun 1 14:07:10 2015 +0200
[backend] removed creation of symlinks for log.gz
>---------------------------------------------------------------
backend/backend/mockremote/__init__.py | 26 +++++++++---------
backend/tests/mockremote/test_mockremote.py | 36 +++++++++++++-------------
2 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/backend/backend/mockremote/__init__.py b/backend/backend/mockremote/__init__.py
index 03df070..6e7a336 100755
--- a/backend/backend/mockremote/__init__.py
+++ b/backend/backend/mockremote/__init__.py
@@ -292,18 +292,18 @@ class MockRemote(object):
self.mark_dir_with_build_id()
- def add_log_symlinks(self):
- # adding symlinks foo.log.gz -> foo.log for web server auto index
- try:
- base = self._get_pkg_destpath()
- for name in os.listdir(base):
- if not name.endswith(".log.gz"):
- continue
- full_path = os.path.join(base, name)
- if os.path.isfile(full_path):
- os.symlink(full_path, full_path.replace(".log.gz", ".log"))
- except Exception as err:
- self.log.exception(err)
+ # def add_log_symlinks(self):
+ # # adding symlinks foo.log.gz -> foo.log for nginx web server auto index
+ # try:
+ # base = self._get_pkg_destpath()
+ # for name in os.listdir(base):
+ # if not name.endswith(".log.gz"):
+ # continue
+ # full_path = os.path.join(base, name)
+ # if os.path.isfile(full_path):
+ # os.symlink(full_path, full_path.replace(".log.gz", ".log"))
+ # except Exception as err:
+ # self.log.exception(err)
def build_pkg_and_process_results(self):
"""
@@ -332,7 +332,7 @@ class MockRemote(object):
# downloading
self.log.info("Start retrieve results for: {0}".format(self.pkg))
self.builder.download(self.pkg, self.chroot_dir)
- self.add_log_symlinks()
+ # self.add_log_symlinks() # todo: add config option, need this for nginx
self.log.info("End retrieve results for: {0}".format(self.pkg))
if build_error:
diff --git a/backend/tests/mockremote/test_mockremote.py b/backend/tests/mockremote/test_mockremote.py
index 5030833..a2ae66a 100644
--- a/backend/tests/mockremote/test_mockremote.py
+++ b/backend/tests/mockremote/test_mockremote.py
@@ -273,24 +273,24 @@ class TestMockRemote(object):
# do not raise an error
self.mr.mark_dir_with_build_id()
- def test_add_log_symlinks(self, f_mock_remote):
- base = os.path.join(self.DESTDIR_CHROOT,
- "{}-{}".format(self.PKG_NAME, self.PKG_VERSION))
- os.makedirs(base)
-
- names = ["build.log", "root.log"]
- for name in names:
- open(os.path.join(base, name + ".gz"), "a").close()
- assert not os.path.exists(os.path.join(base, name))
-
- dir_name = "i_am_a_dir.log"
- os.mkdir(os.path.join(base, dir_name + ".gz"))
- assert not os.path.exists(os.path.join(base, dir_name))
-
- self.mr.add_log_symlinks()
- assert not os.path.exists(os.path.join(base, dir_name))
- for name in names:
- assert os.path.exists(os.path.join(base, name))
+ # def test_add_log_symlinks(self, f_mock_remote):
+ # base = os.path.join(self.DESTDIR_CHROOT,
+ # "{}-{}".format(self.PKG_NAME, self.PKG_VERSION))
+ # os.makedirs(base)
+ #
+ # names = ["build.log", "root.log"]
+ # for name in names:
+ # open(os.path.join(base, name + ".gz"), "a").close()
+ # assert not os.path.exists(os.path.join(base, name))
+ #
+ # dir_name = "i_am_a_dir.log"
+ # os.mkdir(os.path.join(base, dir_name + ".gz"))
+ # assert not os.path.exists(os.path.join(base, dir_name))
+ #
+ # self.mr.add_log_symlinks()
+ # assert not os.path.exists(os.path.join(base, dir_name))
+ # for name in names:
+ # assert os.path.exists(os.path.join(base, name))
8 years, 11 months