Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2024-09-05 15:46:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new.10096 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Thu Sep 5 15:46:19 2024 rev:158 rq:1198721 version:3006.0 Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2024-09-01 19:21:10.999417126 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new.10096/salt.changes 2024-09-05 15:46:43.446917383 +0200 @@ -1,0 +2,17 @@ +Wed Sep 4 12:23:53 UTC 2024 - Pablo Suárez Hernández <pablo.suarezhernan...@suse.com> + +- Set contextvars as a build requirement for package + +------------------------------------------------------------------- +Wed Sep 4 11:38:07 UTC 2024 - Marek Czernek <marek.czer...@suse.com> + +- Increase warn_until_date date for code we still support +- The test_debian test now uses port 80 for ubuntu keyserver +- Fix too frequent systemd service restart in test_system test + +- Added: + * fix-test_debian-to-work-in-our-infrastructure-676.patch + * fix-test_system-flaky-setup_teardown-fn.patch + * fix-deprecated-code-677.patch + +------------------------------------------------------------------- New: ---- fix-deprecated-code-677.patch fix-test_debian-to-work-in-our-infrastructure-676.patch fix-test_system-flaky-setup_teardown-fn.patch BETA DEBUG BEGIN: New: * fix-test_system-flaky-setup_teardown-fn.patch * fix-deprecated-code-677.patch New:- Added: * fix-test_debian-to-work-in-our-infrastructure-676.patch * fix-test_system-flaky-setup_teardown-fn.patch New: * fix-test_debian-to-work-in-our-infrastructure-676.patch * fix-test_system-flaky-setup_teardown-fn.patch * fix-deprecated-code-677.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.Kg0cDu/_old 2024-09-05 15:46:46.507044389 +0200 +++ /var/tmp/diff_new_pack.Kg0cDu/_new 2024-09-05 15:46:46.511044555 +0200 @@ -427,6 +427,13 @@ Patch132: improve-error-handling-with-different-openssl-versio.patch # PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/66856 Patch133: avoid-crash-on-wrong-output-of-systemctl-version-bsc.patch +# PATCH-FIX_UPSTREAM: https://github.com/saltstack/salt/pull/66861 +# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/675 +Patch134: fix-test_system-flaky-setup_teardown-fn.patch +# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/676 +Patch135: fix-test_debian-to-work-in-our-infrastructure-676.patch +# PATCH-FIX_OPENSUSE: https://github.com/openSUSE/salt/pull/677 +Patch136: fix-deprecated-code-677.patch ### IMPORTANT: The line below is used as a snippet marker. Do not touch it. ### SALT PATCHES LIST END @@ -545,6 +552,7 @@ BuildRequires: python3-distro BuildRequires: python3-looseversion BuildRequires: python3-packaging +BuildRequires: python3-contextvars # requirements/zeromq.txt %if %{with test} ++++++ _lastrevision ++++++ --- /var/tmp/diff_new_pack.Kg0cDu/_old 2024-09-05 15:46:46.607048539 +0200 +++ /var/tmp/diff_new_pack.Kg0cDu/_new 2024-09-05 15:46:46.611048705 +0200 @@ -1,3 +1,3 @@ -691a47044edb2338cd754103a09089b4a8cf9994 +b3caa0c982743b8a164bb7f2d3b9d6a33593e515 (No newline at EOF) ++++++ fix-deprecated-code-677.patch ++++++ >From d5f3df07783d8aaf3a897ca2f209e662973b930c Mon Sep 17 00:00:00 2001 From: Marek Czernek <marek.czer...@suse.com> Date: Wed, 4 Sep 2024 13:11:33 +0200 Subject: [PATCH] Fix deprecated code (#677) Due to SUSE's extended support policy, we won't remove code from Salt until next major release. --- salt/_logging/handlers.py | 6 +++--- salt/log/__init__.py | 2 +- salt/log/handlers/__init__.py | 2 +- salt/log/mixins.py | 2 +- salt/log/setup.py | 4 ++-- salt/modules/aptpkg.py | 2 +- salt/modules/cassandra_mod.py | 2 +- salt/returners/cassandra_return.py | 2 +- salt/returners/django_return.py | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/salt/_logging/handlers.py b/salt/_logging/handlers.py index f4b0b6fec3d..5a1a1613137 100644 --- a/salt/_logging/handlers.py +++ b/salt/_logging/handlers.py @@ -36,7 +36,7 @@ class TemporaryLoggingHandler(logging.NullHandler): def __init__(self, level=logging.NOTSET, max_queue_size=10000): warn_until_date( - "20240101", + "20260101", "Please stop using '{name}.TemporaryLoggingHandler'. " "'{name}.TemporaryLoggingHandler' will go away after " "{{date}}.".format(name=__name__), @@ -225,7 +225,7 @@ if sys.version_info < (3, 7): def __init__(self, queue): # pylint: disable=useless-super-delegation super().__init__(queue) warn_until_date( - "20240101", + "20260101", "Please stop using '{name}.QueueHandler' and instead " "use 'logging.handlers.QueueHandler'. " "'{name}.QueueHandler' will go away after " @@ -283,7 +283,7 @@ else: def __init__(self, queue): # pylint: disable=useless-super-delegation super().__init__(queue) warn_until_date( - "20240101", + "20260101", "Please stop using '{name}.QueueHandler' and instead " "use 'logging.handlers.QueueHandler'. " "'{name}.QueueHandler' will go away after " diff --git a/salt/log/__init__.py b/salt/log/__init__.py index 3458474f2ca..69bfa8ed15b 100644 --- a/salt/log/__init__.py +++ b/salt/log/__init__.py @@ -24,7 +24,7 @@ from salt.log.setup import ( from salt.utils.versions import warn_until_date warn_until_date( - "20240101", + "20260101", "Please stop using '{name}' and instead use 'salt._logging'. " "'{name}' will go away after {{date}}.".format(name=__name__), stacklevel=3, diff --git a/salt/log/handlers/__init__.py b/salt/log/handlers/__init__.py index 8bc740e20f1..55cf10cdb78 100644 --- a/salt/log/handlers/__init__.py +++ b/salt/log/handlers/__init__.py @@ -12,7 +12,7 @@ from salt._logging.handlers import ( from salt.utils.versions import warn_until_date warn_until_date( - "20240101", + "20260101", "Please stop using '{name}' and instead use 'salt._logging.handlers'. " "'{name}' will go away after {{date}}.".format(name=__name__), ) diff --git a/salt/log/mixins.py b/salt/log/mixins.py index 6619b564198..65f5ed7f78a 100644 --- a/salt/log/mixins.py +++ b/salt/log/mixins.py @@ -11,7 +11,7 @@ from salt.utils.versions import warn_until_date # pylint: enable=unused-import warn_until_date( - "20240101", + "20260101", "Please stop using '{name}' and instead use 'salt._logging.mixins'. " "'{name}' will go away after {{date}}.".format(name=__name__), ) diff --git a/salt/log/setup.py b/salt/log/setup.py index 74bd7bbd3e1..f4c80b0f280 100644 --- a/salt/log/setup.py +++ b/salt/log/setup.py @@ -21,7 +21,7 @@ from salt._logging.impl import set_log_record_factory as setLogRecordFactory from salt.utils.versions import warn_until_date warn_until_date( - "20240101", + "20260101", "Please stop using '{name}' and instead use 'salt._logging'. " "'{name}' will go away after {{date}}. Do note however that " "'salt._logging' is now considered a non public implementation " @@ -34,7 +34,7 @@ def _deprecated_warning(func): @wraps(func) def wrapper(*args, **kwargs): warn_until_date( - "20240101", + "20260101", "Please stop using 'salt.log.setup.{name}()' as it no longer does anything and " "will go away after {{date}}.".format(name=func.__qualname__), stacklevel=4, diff --git a/salt/modules/aptpkg.py b/salt/modules/aptpkg.py index ad5450c4151..cd40aea54f1 100644 --- a/salt/modules/aptpkg.py +++ b/salt/modules/aptpkg.py @@ -3128,7 +3128,7 @@ def expand_repo_def(**kwargs): NOT USABLE IN THE CLI """ warn_until_date( - "20250101", + "20260101", "The pkg.expand_repo_def function is deprecated and set for removal " "after {date}. This is only unsed internally by the apt pkg state " "module. If that's not the case, please file an new issue requesting " diff --git a/salt/modules/cassandra_mod.py b/salt/modules/cassandra_mod.py index 029fd08fb9b..db9c8821920 100644 --- a/salt/modules/cassandra_mod.py +++ b/salt/modules/cassandra_mod.py @@ -45,7 +45,7 @@ def __virtual__(): ) warn_until_date( - "20240101", + "20260101", "The cassandra returner is broken and deprecated, and will be removed" " after {date}. Use the cassandra_cql returner instead", ) diff --git a/salt/returners/cassandra_return.py b/salt/returners/cassandra_return.py index ac01a4e46cb..5fcc00ee8ce 100644 --- a/salt/returners/cassandra_return.py +++ b/salt/returners/cassandra_return.py @@ -53,7 +53,7 @@ def __virtual__(): if not HAS_PYCASSA: return False, "Could not import cassandra returner; pycassa is not installed." warn_until_date( - "20240101", + "20260101", "The cassandra returner is broken and deprecated, and will be removed" " after {date}. Use the cassandra_cql returner instead", ) diff --git a/salt/returners/django_return.py b/salt/returners/django_return.py index 36386875552..474653f3831 100644 --- a/salt/returners/django_return.py +++ b/salt/returners/django_return.py @@ -57,7 +57,7 @@ __virtualname__ = "django" def __virtual__(): warn_until_date( - "20240101", + "20260101", "The django returner is broken and deprecated, and will be removed" " after {date}.", ) -- 2.46.0 ++++++ fix-test_debian-to-work-in-our-infrastructure-676.patch ++++++ >From a6d27a6f50bbbea539ec64bf96a5b9755e32bf69 Mon Sep 17 00:00:00 2001 From: Marek Czernek <marek.czer...@suse.com> Date: Wed, 4 Sep 2024 13:11:05 +0200 Subject: [PATCH] Fix test_debian to work in our infrastructure (#676) --- tests/pytests/functional/states/pkgrepo/test_debian.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pytests/functional/states/pkgrepo/test_debian.py b/tests/pytests/functional/states/pkgrepo/test_debian.py index 87716706d5e..7bda100b634 100644 --- a/tests/pytests/functional/states/pkgrepo/test_debian.py +++ b/tests/pytests/functional/states/pkgrepo/test_debian.py @@ -205,7 +205,7 @@ def ubuntu_state_tree(system_aptsources, state_tree, grains): - dist: {{ codename }} - file: /etc/apt/sources.list.d/firefox-beta.list - keyid: CE49EC21 - - keyserver: keyserver.ubuntu.com + - keyserver: hkp://keyserver.ubuntu.com:80 {%- endif %} {%- if backports %}{%- do ubuntu_repos.append('kubuntu-ppa') %} -- 2.46.0 ++++++ fix-test_system-flaky-setup_teardown-fn.patch ++++++ >From 5567f2bd51d66b7797c986cf64f79f71ca57eb63 Mon Sep 17 00:00:00 2001 From: Marek Czernek <marek.czer...@suse.com> Date: Wed, 4 Sep 2024 13:10:44 +0200 Subject: [PATCH] Fix test_system flaky setup_teardown fn --- tests/pytests/functional/modules/test_system.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/pytests/functional/modules/test_system.py b/tests/pytests/functional/modules/test_system.py index 2cd03a3a3e4..270aafbe2cd 100644 --- a/tests/pytests/functional/modules/test_system.py +++ b/tests/pytests/functional/modules/test_system.py @@ -4,10 +4,12 @@ import os import signal import subprocess import textwrap +import time import pytest import salt.utils.files +from salt.exceptions import CommandExecutionError INSIDE_CONTAINER = os.getenv("HOSTNAME", "") == "salt-test-container" @@ -80,7 +82,13 @@ def setup_teardown_vars(file, service, system): file.remove("/etc/machine-info") if _systemd_timesyncd_available_: - res = service.start("systemd-timesyncd") + try: + res = service.start("systemd-timesyncd") + except CommandExecutionError: + # We possibly did too many restarts in too short time + # Wait 10s (default systemd timeout) and try again + time.sleep(10) + res = service.start("systemd-timesyncd") assert res -- 2.46.0
