diff --git a/huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch b/huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch new file mode 100644 index 0000000000000000000000000000000000000000..69717cf0d064c3bfdd4dfbcb072e3f875b835831 --- /dev/null +++ b/huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch @@ -0,0 +1,41 @@ +From 6692ac290a32f5f4345f87caab523c2333e219b8 Mon Sep 17 00:00:00 2001 +From: caixiaomeng 00662745 +Date: Mon, 28 Oct 2024 11:21:34 +0800 +Subject: [PATCH] huawei modify testcase port for avoid conflict with k8s in + 8080 + +--- + tests/bugzilla_plugin.at.in | 2 +- + tests/mock_bugzilla_server/mock_bugzilla_server.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/bugzilla_plugin.at.in b/tests/bugzilla_plugin.at.in +index 22f7fe2..eaf837b 100644 +--- a/tests/bugzilla_plugin.at.in ++++ b/tests/bugzilla_plugin.at.in +@@ -183,7 +183,7 @@ TS_MAIN + sleep(3); + + struct bugzilla_struct rhbz = { 0 }; +- rhbz.b_bugzilla_url = "http://localhost:8080/"; ++ rhbz.b_bugzilla_url = "http://localhost:9137/"; + rhbz.b_bugzilla_xmlrpc = g_build_filename(rhbz.b_bugzilla_url, "xmlrpc.cgi", NULL); + rhbz.b_ssl_verify = FALSE; + +diff --git a/tests/mock_bugzilla_server/mock_bugzilla_server.py b/tests/mock_bugzilla_server/mock_bugzilla_server.py +index 14d1582..5e84e9c 100755 +--- a/tests/mock_bugzilla_server/mock_bugzilla_server.py ++++ b/tests/mock_bugzilla_server/mock_bugzilla_server.py +@@ -75,7 +75,7 @@ def populate_struct(dest: dict, src: dict, keys: List[str]): + except KeyError: + pass + +-with MyXMLRPCServer(('', 8080), requestHandler=RequestHandler) as server: ++with MyXMLRPCServer(('', 9137), requestHandler=RequestHandler) as server: + class Bug: + @staticmethod + @server.register_function(name='Bug.create') +-- +2.33.0 + + diff --git a/libreport.spec b/libreport.spec index f4ee31d58d62540b83585b35dd2508ec0fe41540..2fb36ffab381e7425db6c8e8d0bbab4282b12218 100644 --- a/libreport.spec +++ b/libreport.spec @@ -2,13 +2,14 @@ Name: libreport Version: 2.17.10 -Release: 1 +Release: 2 License: GPLv2+ Summary: Generic library for reporting various problems URL: https://abrt.readthedocs.org/ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Patch9000: fix-bug-delete-gtk-deprecation-warnings.patch +Patch9001: huawei-modify-testcase-port-for-avoid-conflict-with-k8s-in-.patch BuildRequires: dbus-devel gtk3-devel curl-devel desktop-file-utils python3-devel BuildRequires: gettext libxml2-devel libtar-devel intltool libtool texinfo asciidoc xmlto @@ -334,6 +335,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/bugzilla_formatdup_anaconda.conf.5.* %changelog +* Thu Nov 21 2024 Wenhua Huang - 2.17.10-2 +- Modify testcase port for avoid conflict with k8s + * Thu Jun 29 2023 dillon chen - 2.17.10-1 - update version to 2.17.10