saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
119258 commits 34 branches 292 tags 803 MiB
Commit graph

119258 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pedro Algarvio
9356099229
Cleanup and fix tests after the merge-forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-06 14:15:34 +00:00
Pedro Algarvio
38e72b2716
Need to check for both _closing and _closed 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-06 12:12:46 +00:00
Pedro Algarvio
c78b214d0e
Bump a few requirements that got downgraded during the merge-forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-05 17:09:16 +00:00
Pedro Algarvio
ba85fb6c07
Merge 3006.x into master 2023-11-05 16:52:51 +00:00
Pedro Algarvio
49e5127eb5 Integration tests without splits now take longer then 7 hours. Split it again. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-05 10:46:22 +00:00
Pedro Algarvio
e43d884db7
Enabling zmq_monitor makes the test test_req_server_garbage_request hang 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-04 18:34:02 +00:00
Pedro Algarvio
11783d6221 Bump to werkzeug==3.0.1 due to https://github.com/advisories/GHSA-hrfv-mqp8-q5rw 
Does not upgrade for Py3.7 since this version of werkzeug does not support 3.7.
This also upgrades to `pytest-httpserver==1.0.8`

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-04 06:27:55 +00:00
Pedro Algarvio
5e6fcf022b Backport https://github.com/saltstack/salt/pull/64323 (Just the requirements) 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-04 06:27:55 +00:00
Pedro Algarvio
3d56434d3e Upgrade to `pytest-skip-markers==1.5.0` 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-04 06:27:55 +00:00
David Murphy
d891daa222 Ensure any pre-exiting incorrect ufw directory /etc/ufw/applications.d/salt-master is removed 2023-11-04 06:24:42 +00:00
Pedro Algarvio
6c9dc08bb1
Remove char wrongly introduced in merge-forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-03 20:13:03 +00:00
Pedro Algarvio
baa119fa01
Run pyupgrade against changed files in merge-forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-03 20:05:49 +00:00
Pedro Algarvio
e7b5f24ab3
Merge 3006.x into master 2023-11-03 20:05:20 +00:00
David Murphy
90fe04b304 Adjust break in control file to 3006.4, for updated salt-common commit b3fcdf8 2023-11-03 18:30:04 +00:00
David Murphy
6b334b72ed Marked odict as no code-coverage, and removed some proposed tests, essentially using Python's OrderedDict 2023-11-03 12:16:34 +00:00
David Murphy
45932d9112 WIP Ported test_data.py from unittest to pytest and adding additional tests 2023-11-03 12:16:34 +00:00
Pedro Algarvio
bb1bc2a326 And apparently 2 hours is not enough to run one of the integration test chunks 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-03 07:11:29 +00:00
Pedro Algarvio
480a543db7 5 hours is not enough to run the integration tests in a single chunk 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-03 07:11:29 +00:00
Pedro Algarvio
2ba6543016 The problem is still present in 3006.4, can't test downgrade 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-03 06:46:00 +00:00
Pedro Algarvio
b83ede5272 Address my own review comments 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-03 06:46:00 +00:00
Barney Sowood
e5b9489731 Disable test for 65231 on downgrade to 3006.3 
Disables the running of the test for 65231 when downgrading to 3006.3
as the issue that is fixed is in 3006.3 so test will fail when 3006.3
is installed.
 2023-11-03 06:46:00 +00:00
Barney Sowood
ffb8e84f60 Add changelog 2023-11-03 06:46:00 +00:00
Barney Sowood
1dad8745de Add test for issue 65231 2023-11-03 06:46:00 +00:00
Barney Sowood
59f731c94f Add initial tests for logrotate configs 
Adds initial tests for logrotate configs to ensure they are installed
in the correct location.
 2023-11-03 06:46:00 +00:00
Barney Sowood
1abcf81601 Fix install of logrotate config for debian pkg 
Fixes the install of logrotate config for the debian pkg
by moving file to pkg/common/logrotate/salt-common. File
is installed via salt-common.install file, which can't
rename files, only copy them to a directory, so we need to
rename the file and put it in a subdir of pkg/common.

Adds /etc/logrotate.d/salt-common to salt.common.conffiles to
ensure that dpkg will not overwrite configs modified by users.

Also updates RPM spec file for new location of logrotate config.

Config needs to be /etc/logrotate.d/salt-common as that is what
is used by 3005.x packages.
 2023-11-03 06:46:00 +00:00
cmcmarrow
4fd5072dbd bumpy pygit2 2023-11-03 05:44:26 +00:00
Renato Caldas
da7fbf8c0c Fix pre-commit checks 2023-11-02 08:33:23 +00:00
Renato Caldas
a73e655513 Fix duplicated initialization 2023-11-02 08:33:23 +00:00
David Murphy
29a6202f96 Updatd test per reviewer comments 2023-11-02 08:23:36 +00:00
David Murphy
42a2149621 Ported tesT_listdiff.py from unittest to pytest and additional code-coverage tests 2023-11-02 08:23:36 +00:00
Pedro Algarvio
94a74fc3f3 The default timeout values are now passed as inputs 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-02 08:22:35 +00:00
Pedro Algarvio
53f54d08d9
Merge pull request #65485 from s0undt3ch/hotfix/merge-forward 
[master] Merge 3006.x into master
 2023-10-31 09:31:41 +00:00
Pedro Algarvio
f0c3a19037 When getting salt releases, on failure, try the main repository 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-31 09:28:47 +00:00
Pedro Algarvio
0d5a6bf7f7 Switch to tools.utils.gh.get_github_token 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-31 09:28:47 +00:00
Pedro Algarvio
68bca1ee8d On nightly and scheduled builds, don't run split tests. GH is not coping. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-31 09:28:47 +00:00
Pedro Algarvio
7df5e0a4d5 Always download the onedir artifact. 
Otherwise the publish repositories step won't happen if we skip the
package download tests.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-31 09:28:47 +00:00
Daniel A. Wozniak
096314341f Add changelog 2023-10-31 07:55:54 +00:00
Daniel A. Wozniak
ae1bf35ce8 Add test coverage 2023-10-31 07:55:54 +00:00
Daniel A. Wozniak
8a872eff08 Preserve futures with messages 
This also make the message client behave more like it does after having
been refactored to use native asyncio coroutines.
 2023-10-31 07:55:54 +00:00
Daniel A. Wozniak
f6ad1a5f94 Fix timeout test 2023-10-31 07:55:54 +00:00
Daniel A. Wozniak
529d27061e Use closure to preserve message future 2023-10-31 07:55:54 +00:00
Daniel A. Wozniak
84d58f717b Do not allow duplicate message ids 2023-10-31 07:55:54 +00:00
Pedro Algarvio
3843bdab93
Upgrade some dependencies which got downgraded on the merge-forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-29 22:44:56 +00:00
Pedro Algarvio
8edd383c0e
Run pyupgrade against modified files in the merge-forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-29 22:29:28 +00:00
Pedro Algarvio
c8f5d589d2
Merge 3006.x into master 2023-10-29 22:25:59 +00:00
Pedro Algarvio
5d1458287a
Merge pull request #65482 from s0undt3ch/hotfix/3006.x-fixes 
[3006.x] Merge v3005.4 and v3006.4 into 3006.x
 2023-10-29 16:35:04 +00:00
Pedro Algarvio
e46e33ab9d
Remove unused variable 
Added while resolving conflicts from merge forward

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-29 11:03:09 +00:00
Pedro Algarvio
be3d892fc9
Remove docker from requirements/static/ci/common.in 
It was wrongly added whew resolving conflicts while merging forward

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-29 11:00:57 +00:00
Pedro Algarvio
a6ea97f46c
Merge v3005.4 into 3006.x 2023-10-29 09:31:08 +00:00
Pedro Algarvio
16dce0b4cc
Merge v3006.4 into 3006.x 2023-10-29 09:24:34 +00:00