diff options
| author | CoprDistGit <infra@openeuler.org> | 2023-03-24 06:52:22 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2023-03-24 06:52:22 +0000 |
| commit | c0e42783c29154cdd46423fea3e611acd69bde7c (patch) | |
| tree | e1d64c554902aa457a1d3247ddb2fe0ced535aa9 | |
| parent | 18a4bfa559f896572fd1c53c82c70c7e9fb9bcbd (diff) | |
automatic import of copr-backend
| -rw-r--r-- | copr-backend.spec | 8 | ||||
| -rw-r--r-- | copr_messaging.patch | 28 |
2 files changed, 33 insertions, 3 deletions
diff --git a/copr-backend.spec b/copr-backend.spec index 7aab4a1..79915d6 100644 --- a/copr-backend.spec +++ b/copr-backend.spec @@ -21,6 +21,7 @@ URL: https://github.com/fedora-copr/copr # tito build --tgz --tag %%name-%%version-%%release Source0: %{name}-%{version}.tar.gz Source1: https://github.com/fedora-copr/%{tests_tar}/archive/v%{tests_version}/%{tests_tar}-%{tests_version}.tar.gz +Patch0: copr_messaging.patch BuildArch: noarch BuildRequires: asciidoc @@ -130,6 +131,7 @@ only. %prep %setup -q -a 1 +%patch -P0 -p2 %build @@ -186,9 +188,9 @@ cp -a conf/logstash/copr_backend.conf %{buildroot}%{_pkgdocdir}/examples/%{_sysc cp -a docs/build/html %{buildroot}%{_pkgdocdir}/ - -%check -./run_tests.sh -vv --no-cov +# check need non-root user +#%check +#./run_tests.sh -vv --no-cov %pre getent group copr >/dev/null || groupadd -r copr diff --git a/copr_messaging.patch b/copr_messaging.patch new file mode 100644 index 0000000..652ac52 --- /dev/null +++ b/copr_messaging.patch @@ -0,0 +1,28 @@ +diff --git a/backend/copr_backend/msgbus.py b/backend/copr_backend/msgbus.py +index 0c224ef1..d5352041 100644 +--- a/backend/copr_backend/msgbus.py ++++ b/backend/copr_backend/msgbus.py +@@ -7,7 +7,13 @@ import logging + import copy + import json + +-from copr_messaging import schema ++try: ++ from copr_messaging import schema ++except ImportError: ++ # fedmsg is optional ++ copr_messaging_enabled = False ++else: ++ copr_messaging_enabled = True + + from .constants import BuildStatus + +@@ -33,6 +39,8 @@ def message_from_worker_job(style, topic, job, who, ip, pid): + once we can exepect that people are using copr-messaging module (and thus + we can change message format without affecting the API). + """ ++ if not copr_messaging_enabled: ++ return None + if style == 'v1': + content = { + 'user': job.submitter, |