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

118871 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pedro Algarvio
8dc6f1c8f5
Merge 3006.x into master 2023-09-26 21:44:35 +01:00
Pedro Algarvio
6d0224f08c
Also install tornado before starting Salt 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-26 21:44:31 +01:00
Pedro Algarvio
c2779df50c
Merge pull request #65282 from s0undt3ch/hotfix/merge-forward 
[master] Merge 3006.x into master
 2023-09-26 21:43:21 +01:00
Pedro Algarvio
e8115ec126 Fix onedir code coverage collection and reporting 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-26 20:57:49 +01:00
Pedro Algarvio
29a57d2d32 Generate the XML code coverage reports before trying to use them 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-26 20:57:49 +01:00
Pedro Algarvio
2430a0eeb3 Don't erase collected coverage data on test failure re-runs 
Fixes #65214

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-26 20:57:49 +01:00
Pedro Algarvio
023bd39eb5
Run pyupgrade against changed files from merge forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-26 12:00:37 +01:00
Pedro Algarvio
b85da8d8b0
Merge 3006.x into master 2023-09-26 07:01:03 +01:00
Pedro Algarvio
5241abd10a Bump to cryptography==41.0.4 due to https://github.com/advisories/GHSA-v8gr-m533-ghj9 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 21:03:45 +01:00
Pedro Algarvio
da7d79a200 Only the /salt mount is important 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
74b75fc109 Skip tests which are only meant to work on x86_64 platforms 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
45730ab75a Update to latest Photon OS golden images 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
676a3f39cf Assert against the return code of the executed commands 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
31f50159a6 Use the salt release images from the salt-ci-containers repository 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
836cd87e08 MariaDB 10.6 was never tested. Removing for the time being. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
8948493f07 Fix the mysql-server container name 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
8702d275ed The 5.5 version of the percona container is no longer available 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
e348a49ed5 Bump to pytest-salt-factories==1.0.0rc26 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
d35ff0a9a0 If the IP address that is on file doesn't match, write the file again 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
2ccf2401dc Different subnet to avoid the tests getting skipped 
```
Failed to create docker network: {
  'name': 'salt-performance',
  'changes': {},
  'result': False,
  'comment': "Failed to create network 'salt-performance': Error 403: Pool overlaps with other one on this address space"
}
```

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
99b9246760 Add missing space 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
91e99fbd96 Update to latest golden images 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
be09ff0c92 Continue using the old Windows AMIs 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
6dfec54dfe Temporarily de-whitelist on windows. These tests hang with the new golden images. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
2dfc9b286f Thrown an error once we stop testing against 3005.x to cleanup old code 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
47d1d34398 Don't run upgrade tests for Photon OS 4 Arm64 packages. 
We never had these prior to 3006.0

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
444ab0d12e Start testing PhotonOS 4 Arm64 packages 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
96e59557ef Update to latest golden images 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
6fc622ffdd
Run pyupgrade against changed files from merge forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 11:58:54 +01:00
Pedro Algarvio
f1c619292f
Adjust a few requirements that got changed during the conflict solving 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 11:53:57 +01:00
Pedro Algarvio
5e093b3b8d
Merge 3006.x into master 2023-09-25 11:41:20 +01:00
Pedro Algarvio
070774f38c Fix pre-commit regarding static requirements compilation 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 11:29:15 +01:00
James Howe
49411d1c24 Update doc/ref/states/requisites.rst 
Co-authored-by: Pedro Algarvio <pedro@algarvio.me>
(cherry picked from commit fc58fa4d9d)
 2023-09-25 01:51:20 +01:00
James Howe
a2c70b7239 Fix heading level of "creates" 
(cherry picked from commit d38a372687)
 2023-09-25 01:51:20 +01:00
Pedro Algarvio
519666b0cf Set cgroupns to host to fix the libvirt migration tests. 
This needs a newer version of the python docker package.

The breakage was due to updating the docker container used. - https://github.com/saltstack/salt-ci-containers/pull/42

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-24 22:10:53 +01:00
Pedro Algarvio
9fb51b083a Bump to docker==6.1.2 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-24 22:10:53 +01:00
Pedro Algarvio
fb717a8d4b Downgrade to sqren/backport-github-action@v8.9.7 at least errors are reported 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-24 21:24:38 +01:00
Pedro Algarvio
dde485bf94 Downgrade to sqren/backport-github-action@v8.9.7 at least errors are reported 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-24 21:23:47 +01:00
Clay Oster
667542ccbd Fix salt user login shell path in Debian packages 
(cherry picked from commit f4efa4fb79)

# Conflicts:
#	pkg/tests/integration/test_salt_user.py
 2023-09-24 21:01:13 +01:00
Pedro Algarvio
27f90f7239
Merge pull request #65239 from s0undt3ch/hotfix/merge-forward 
[master] Merge 3006.x into master
 2023-09-24 17:53:58 +01:00
Pedro Algarvio
821522244f Upgrade to sqren/backport-github-action@v9.3.0-a 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-24 10:28:25 +01:00
Pedro Algarvio
902eec14b6 Upgrade to sqren/backport-github-action@v9.3.0-a 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-24 10:27:45 +01:00
MKLeb
23bb7cd2e4 Remove the workaround for the salt-proxy script not working in classic macos packages 2023-09-22 15:15:16 -07:00
Pedro Algarvio
24d2fef2fa
Merge 3006.x into master 2023-09-22 08:39:31 +01:00
Pedro Algarvio
55c55bc4b3
Merge pull request #65255 from s0undt3ch/hotfix/3006.x-fixes 
[3006.x] Merge freeze(3005.3) into 3006.x
 2023-09-22 08:36:26 +01:00
Pedro Algarvio
f067969b65
Merge freeze(3005.3) into 3006.x 2023-09-21 21:16:10 +01:00
Pedro Algarvio
aa0d0b50ab
Run pyupgrade on changed files from merge forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-21 21:14:47 +01:00
Pedro Algarvio
f334749c5f
Merge 3006.x into master 2023-09-21 20:41:31 +01:00
nicholasmhughes
8fbb5d3a26 remove permission check as its probably an unreachable edge case 2023-09-21 10:40:58 -07:00
nicholasmhughes
b19682a297 root can still read the file and tests run as root 2023-09-21 10:40:58 -07:00