diff --git a/roles/copr/backend/files/patches/dont-send-msg-N-times.patch b/roles/copr/backend/files/patches/dont-send-msg-N-times.patch new file mode 100644 index 0000000000..c7bfc79400 --- /dev/null +++ b/roles/copr/backend/files/patches/dont-send-msg-N-times.patch @@ -0,0 +1,12 @@ +https://pagure.io/fedora-infrastructure/issue/8560 + +--- /usr/share/copr/backend/msgbus.py 2020-01-15 08:23:09.000000000 +0000 ++++ /usr/share/copr/backend/msgbus.py 2020-01-20 09:53:36.100341122 +0000 +@@ -181,6 +181,7 @@ + for attempt in range(1, self.opts.bus_publish_retries + 1): + try: + self._send_message(message) ++ break + except Exception: # pylint: disable=W0703 + # We don't want to halt the worker because of messaging. + self.log.exception("Attempt %s to publish a message failed", attempt) diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index a92ff89f82..c352d5e007 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -38,6 +38,11 @@ dest=/usr/bin/copr-repo tags: patches +- name: patch for https://pagure.io/fedora-infrastructure/issue/8560 + patch: src=patches/dont-send-msg-N-times.patch + dest=/usr/share/copr/backend/msgbus.py + tags: patches + - name: install openstackclient for image preparation dnf: state=present name=python3-openstackclient when: devel|bool