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
118288 commits 34 branches 292 tags 803 MiB
Commit graph

118288 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pedro Algarvio
e8a392577d
Fix merged forwarded code and test 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-17 09:54:54 +01:00
Pedro Algarvio
ad4821b87f
Run pyupgrade on the files changed on the merge forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-16 09:16:19 +01:00
Pedro Algarvio
22107ebd32
Merge 3006.x into master 2023-08-15 22:29:25 +01:00
Megan Wilhite
4f03b1d6ff
Merge pull request #64467 from cmcmarrow/remove_payload_Serial 
[master] remove salt.payload.Serial
 2023-08-15 20:12:28 +00:00
Daniel A. Wozniak
05231cfe5c Bump relenv to 0.13.4 2023-08-15 19:03:46 +00:00
Pedro Algarvio
9d7bec1a6f salt-pip now properly errors out when being called from a non onedir environment. 
Fixes #64249

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-15 08:44:00 -07:00
Daniel A. Wozniak
3996876cb7 Do not patch test if we have a named loader for __opts__ 2023-08-15 16:30:53 +01:00
Daniel A. Wozniak
33cf8a2dc7 Account for times where __opts__ is not defined 
This can happen when we mock things in the test suite
 2023-08-15 16:30:53 +01:00
Daniel A. Wozniak
f08f374e97 Address review nits 2023-08-15 16:30:53 +01:00
Daniel A. Wozniak
dcae0bfc1e Add changelog for 62590 2023-08-15 16:30:53 +01:00
Daniel A. Wozniak
48872effaa Add regression test for 62590 2023-08-15 16:30:53 +01:00
Daniel A. Wozniak
a2102e0ca3 Preserve test condition durring sub-state runs 2023-08-15 16:30:53 +01:00
twangboy
7e76dc9ea7 Skip to see if chocolatey tests are causing the failure 2023-08-15 14:22:34 +00:00
twangboy
4f8c2a4280 Restore current path, rather than removing from path 2023-08-15 14:22:34 +00:00
Pedro Algarvio
3181918225
Merge pull request #64987 from s0undt3ch/3006.x 
[3006.x] Merge freeze(3005.2) into 3006.x
 2023-08-15 10:32:05 +01:00
Pedro Algarvio
90eb7695e3
Fix pre-commit issue 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-15 09:39:20 +01:00
Pedro Algarvio
0136a0cd4b
Merge freeze(3005.2) into 3006.x 2023-08-15 09:20:44 +01:00
Daniel A. Wozniak
20f9b6a8af Give tests a better chance of passing 2023-08-15 09:19:04 +01:00
Daniel A. Wozniak
c5fcaffc7a Preserve master credentials on spawning platforms 
Prevent spawning platform minions from having to re-authenticate on
every job when using multiprocessing=True
 2023-08-15 09:19:04 +01:00
Caleb Beard
9e4e36bf0b
Merge pull request #64959 from MKLeb/mf/3006.2/3006.x 
[3006.x] Merge 3006.2 into 3006.x
 2023-08-14 17:30:28 -04:00
Thomas Phipps
c2676f4e80 manage runner subset documentation fix. 2023-08-14 19:32:12 +00:00
MKLeb
bbeffed460 Add Breaks and Replaces statements to debian/control 2023-08-14 13:02:09 -04:00
nicholasmhughes
245670f37f fix duplicate ref 2023-08-14 16:42:03 +01:00
nicholasmhughes
ea5cd720f1 fix rst formatting 2023-08-14 16:42:03 +01:00
nicholasmhughes
77b516f6a8 adding to_entries and from_entries functions as jinja filters 2023-08-14 16:42:03 +01:00
nicholasmhughes
58b3ab13c9 fixes saltstack/salt#64600 implement jq-esque to_entries and from_entries functions 2023-08-14 16:42:03 +01:00
David Murphy
f0743ec9a8 Added tests for ufw allow salt 2023-08-11 10:22:09 +01:00
David Murphy
bd17823792 Add salt.ufw to salt-master install on Debian and Ubuntu 2023-08-11 10:22:09 +01:00
Antonio Ramón Sánchez Morales
33310ac37d fix(test_mac_brew_pkg): adapt test to also mock path.which 
Signed-off-by: Antonio Ramón Sánchez Morales <antonioramonsm@gmail.com>
(cherry picked from commit 4ac4da9aa4)
 2023-08-11 10:20:43 +01:00
Gareth J. Greenaway
a7903ad473
Update win_network.py 
Fixing lint
 2023-08-10 18:20:09 -07:00
MKLeb
28bb55922b Release v3006.2 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0pCPs6gjsPqzvSH1uza/ZYSimP8FAmTVMykACgkQuza/ZYSi
 mP+iug/8Dc+YFX8WNH5VluC51ClaXezeRTOlLwlI+GFftOVnjdLpoR9/Z+BbDtZn
 zUrEeXzr/mrFy4cIE2ebpMlYb1G/DCUZU/aBhIpChANDIE46nF4YUyKUjfLqqRE0
 LNFXKCkRYE0Vrbr+9U3Ey1tpsX3fldq2wWJq69Mkkj4FS8EAzYBauTgdkX5frri1
 CQsR682tUNVRZGLldE58oxmjDybDYInlPqwXwRuFG5NCfeRrfRVeTdxgMQt8qwfg
 rjVy0Aa31qqEqfPn9Ubo0dRLoGLziTKzoqjGWccKiT33QJlgSsarU9k6ZKY4BJKZ
 5WQTJB+pEjCPztcQvznx0reA4OXK8x0wQC7+EW8Q/PLiu9dJtWPJqYCrzCcKMXzK
 6THpU045ZNYD98WtOQAFtmxc74IIM/ua8kQ531l14sePrI97h4svjxy4qwnG66S6
 5OQQMr9LuyIEXYGF01iVUcuXtRsolJTR2Di72+9TTizFcIow2AQJCVPd7DkWugxI
 1gscFzxvkhhqBYwVzTJYftosIPEbvRnBqfJe8gg3TMtCMaw1Sz6KIdDh80eTa44L
 MRVp20gmudiuEyWWZm5kw8pIFyzRVXuCkbXT5GqAlpoteO6bh+4Oo6qqCPg//ADu
 oLx+nWBxf1aQHTZfsQKl4ba+hZklea3ChnKkeRcEm0CpME3qyZ8=
 =wxG/
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEoUAOmrRrwYAMsPVACJtk6hqZ3dEFAmTVdVASHGNhbGViYkB2
 bXdhcmUuY29tAAoJEAibZOoamd3RVV8P/3FhVP6WZz9ojgh0I+kqmEs2MCKsK06t
 KY+2Rd8aI9HezlHhQu5NYRIEPNOt5Ygpxf2GHudjy8AL9sruea9qjPrlTGOb4KS0
 e8hHfBnEXHVrbwv1pT26Mjhqjndo9jczQdUCRT8nfr7rrlh/d8Iah6figwk55Y04
 ihTslkaCZK8EqJ+M3pyt4rX1QhTrfS19mLKWEaOGj4AabeXb8CfssE89w8dEVuqt
 i4/DDweBU6pz0sLcf/KbtnhcrS6wlSmb/3YG44Kbk1WRm5IC8aUJ4vqf2xBqRzXV
 j74B6trID1JZQY9/iVhgCc+7YsLUxE0XuUwhfYPIbFhDs3b0Gzizh8acYCKkxmMT
 duPY561pae4lSFZL96q8sIwUpi1z3ob3JokZbBwiZ2Rw4wzOB+OnWWQKu5qddn7z
 hrK8T38A0zjdJU3g/mBzPSVzzd3eepxaRgZqo/0s6WUtGYGRX1tn8x5h2xKdWQR1
 njTn2VofLezeu+Hq4C5QzEdVbixkxNdKjqN7Il0fGwc0XHDXazkC6lEQ2YTgJabJ
 EcmVcSS5YNgaf98QRdzby6o5Ezxf2Q8Fv0V5RTpOu6pU6lRTAFYHgrpi6+gOf/37
 76OhlHky/3FAlaZwJni+8uZeBCZok1Wq2J845BR/ny0WSuhImt/lxxdY+oxxakH6
 Oi2XC2B7vAEx
 =AOgK
 -----END PGP SIGNATURE-----

Merge tag 'v3006.2' into mf/3006.2/3006.x

Release v3006.2
 2023-08-10 19:39:38 -04:00
David Murphy
0fda648663 Fix SELinux get policy with trailing whitespace 2023-08-10 16:10:05 -07:00
Antonio Ramón Sánchez Morales
4ac4da9aa4 fix(test_mac_brew_pkg): adapt test to also mock path.which 
Signed-off-by: Antonio Ramón Sánchez Morales <antonioramonsm@gmail.com>
 2023-08-09 20:17:22 +00:00
Antonio Ramón Sánchez Morales
2199d8503b chore(mac_brew_pkg): remove verbose if else chain 
Signed-off-by: Antonio Ramón Sánchez Morales <antonioramonsm@gmail.com>
 2023-08-09 20:17:22 +00:00
Antonio Ramón Sánchez Morales
2e7b0ac875 fix(mac_brew_pkg): avoid using cmd.run on 'None' executable path 
* Sindicate fetching os brew path for use also on __virtual__ method
without running an extra command at this moment

Signed-off-by: Antonio Ramón Sánchez Morales <antonioramonsm@gmail.com>
 2023-08-09 20:17:22 +00:00
Antonio Ramón Sánchez Morales
8e7c528d17 chore(mac_brew_pkg): lint fixes and changelog add 2023-08-09 20:17:22 +00:00
Antonio Ramón Sánchez Morales
4fddd04ed2 fix(mac_brew_pkg): Use format instead of + operator 
Fix for https://github.com/saltstack/salt/actions/runs/5298983857/jobs/9593610712?pr=57946

Signed-off-by: Antonio Ramón Sánchez Morales <antonioramonsm@gmail.com>
 2023-08-09 20:17:22 +00:00
Antonio Ramón Sánchez Morales
b258510a6d chore(mac_brew_pkg): apply lint fixes 
Applied lint patch suggested by this CI job: https://github.com/saltstack/salt/actions/runs/5298983857/jobs/9593574724?pr=57946

Signed-off-by: Antonio Ramón Sánchez Morales <antonioramonsm@gmail.com>
 2023-08-09 20:17:22 +00:00
Antonio Ramón Sánchez Morales
2a522420ca fix(mac_brew_pkg): Use brew path from which 
Signed-off-by: Antonio Ramón Sánchez Morales <antonioramonsm@gmail.com>
 2023-08-09 20:17:22 +00:00
cmcmarrow
67f0c5a6e5 fix pytests 2023-08-09 12:44:56 -05:00
Charles McMarrow
e0854105d6
Merge branch 'master' into remove_payload_Serial 2023-08-09 12:39:56 -05:00
cmcmarrow
584d26d5d7 update tests 2023-08-09 12:39:13 -05:00
Salt Project Packaging
8f750fa7ae Release v3006.2 2023-08-09 12:08:57 +00:00
Pedro Algarvio
2628158336
Remove extra character 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-09 12:51:52 +01:00
Gareth J. Greenaway
39315498d0 removing comment 2023-08-09 11:36:04 +01:00
Gareth J. Greenaway
a8cf6515a0 moving test to pytest. 2023-08-09 11:36:04 +01:00
Gareth J. Greenaway
e32e1f7fcd removing unused os.path.join. moving all patch decorators into the test functions. 2023-08-09 11:36:04 +01:00
Gareth J. Greenaway
9a5a8cb7e6 Adding changelog. 2023-08-09 11:36:04 +01:00
Gareth J. Greenaway
b52bf14dbf Look in location salt is running from, this accounts for running from an unpacked onedir file that has not been installed. 2023-08-09 11:36:04 +01:00
Daniel A. Wozniak
9a4da7d2e3 remove sleeps 2023-08-08 14:47:15 -07:00