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

107 commits

Author SHA1 Message Date
Daniel A. Wozniak
a017805680 Merge remote-tracking branch 'saltstack/3007.x' into merge/master/3007.x 2025-02-17 00:09:58 -07:00
Daniel A. Wozniak
6b3418fe0b Merge remote-tracking branch 'saltstack/3006.x' into merge/3007.x/3006.x 2024-09-20 14:20:13 -07:00
ScriptAutomate
77260acfd5 Drop Arch Linux; update latest golden images 2024-09-18 09:41:24 -07:00
Pedro Algarvio
74415c7d0a
Merge 3007.x into master 2024-03-07 10:06:45 +00:00
Pedro Algarvio
b7630f3b08
Merge 3006.x into 3007.x 2024-02-29 14:25:24 +00:00
Pedro Algarvio
c920ba443d
Remove all kitchen and jenkins related resources 
The salt-project hasn't been using them for a very long time.
 2024-02-29 10:27:02 +00:00
Pedro Algarvio
03ad4c6337 Update code to be Py3.7+ to reduce merge forward conflicts 2024-02-29 10:16:58 +00:00
Pedro Algarvio
0d6d4cfb36 Remove all kitchen and jenkins related resources 
The salt-project hasn't been using them for a very long time.
 2024-02-29 10:16:58 +00:00
Erik Johnson
2b364c92e6 Two tweaks for .gitignore 
1. `/env/` and `/.env` can be represented in a single entry using `/.?env/`
2. Update `/venv/` entry to also ignore `/.venv/`. Some tools (for
   example poetry) will look for and use virtualenvs in the root of a
   project if they are named `.venv`.
 2024-02-06 17:25:47 +00:00
Pedro Algarvio
e3ba31dc7a
Merge 3006.x into 3007.x 2023-12-14 11:32:20 +00:00
Megan Wilhite
d453007a8f Migrate package tests to the main test suite 2023-12-12 15:29:41 -07:00
Pedro Algarvio
a420d94431
Merge 3006.x into master 2023-11-26 16:10:40 +00:00
Pedro Algarvio
185a352d00 Update the tools requirements 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-23 08:44:35 +00:00
MKLeb
bee29be6dd
Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x 2023-09-08 16:25:39 -04:00
Daniel A. Wozniak
d8721e5cd5 Add debug debian package 2023-09-06 16:38:52 +00:00
Pedro Algarvio
d7d5bb30be Preliminary support to download artifacts to run the test suite locally 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-30 13:20:34 +00:00
Alyssa Rock
0caa05c54f Make changes requested by Chunga and Rob H 2023-07-28 17:25:12 +00:00
natalieswork
df28d77fbc adding .env to git ignore 2023-05-22 14:23:44 -04:00
Megan Wilhite
60e35a1990 Use and older version of pytest-salt-factories for pkg tests 2023-02-28 15:27:46 +00:00
Pedro Algarvio
42b7d1be89 Stop relying on salt/_version.py to write Salt's version. 
Instead use `salt/_version.txt` which only contains the version string.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-01-09 12:31:51 -07:00
Daniel A. Wozniak
701633d181 Initial commit of relenv debian package 2022-12-22 07:59:07 -07:00
Pedro Algarvio
1f2c1fac9b Initial work for the Self Github Actions Runners 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2022-12-14 11:23:26 -07:00
twangboy
abadcd3e01 update .gitignore 2021-07-23 13:06:52 -07:00
twangboy
efe2790cdb Change to Success and Failure 2021-07-23 07:10:35 -04:00
Wayne Werner
88a3d0e8e8 Add vim session file to gitignore 2021-05-26 14:05:11 -04:00
ScriptAutomate
837e8dd5d0 Properly ignore requirements logs 2021-04-16 06:53:18 -04:00
twangboy
4733c8234b Remove new line in gitignore 2020-04-25 22:14:26 -07:00
twangboy
400322f318 Add support for pending_reboot grain 
Adds pending_reboot graint
Adds new win_system salt util
Adds tests for new grain
Adds tests for new salt util
 2020-04-25 22:14:26 -07:00
Pedro Algarvio
262ad2e98a
Compile static requirements 2020-03-23 22:36:07 +00:00
ch3ll
7d3d823a59
Merge remote-tracking branch 'upstream/master' into issue_49427 2020-01-06 14:49:29 -05:00
ch3ll
d426f8d7db
Catch os and attribute error 2020-01-06 13:08:52 -05:00
Daniel Wozniak
5e0cfeb347
Merge branch 'master' into salt-check-fullmerge 2020-01-05 18:09:18 -07:00
Imran Iqbal
03a24d5ab5
refactor(kitchen): prefer kitchen.yml to .kitchen.yml 
* Quoting from https://kitchen.ci/docs/getting-started/kitchen-yml/:
  - As of test-kitchen 1.21.0, we now prefer `kitchen.yml` over `.kitchen.yml`.
  - This preference applies to `kitchen.local.yml` as well.
  - This is backward compatible so the dot versions continue to work.
 2019-12-18 18:36:05 +00:00
Christian McHugh
7ccba0cd2c Fresh import on master 2019-12-02 20:35:56 +00:00
Pedro Algarvio
6db414194e
Also ignore multiprocessing coverage files 2019-05-08 13:16:36 +01:00
Pedro Algarvio
91376b321a
Ignore the generated docs archive 2019-05-08 13:16:32 +01:00
Wayne Werner
32aafab79a
Ignore vscode and fix swap ignore 2019-03-26 19:41:13 -05:00
Pedro Algarvio
01b74c06c4
Add initial nox configuration. Tell tox'ers to use nox'. 2019-02-20 16:49:56 +00:00
rallytime
4abfd26e86
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
  - salt/fileclient.py
  - salt/output/__init__.py
  - salt/serializers/configparser.py
  - salt/states/pkg.py
  - salt/states/zpool.py
  - salt/transport/tcp.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_mac_user.py
  - tests/integration/modules/test_pip.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/modules/test_service.py
  - tests/integration/states/test_pip_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_cmdmod.py
 2018-05-23 12:33:00 -04:00
Daniel Wallace
d53b44d10f
remove lock file 2018-05-13 14:35:50 -04:00
Daniel Wallace
e0f7cc1447
add proxy tests decorator to pytest conftest 2018-05-13 08:38:38 -04:00
Daniel Wallace
f56f062a6a
download xml for junit 2017-12-31 11:10:16 -07:00
Daniel Wallace
7cc342a5d6
use new runtests verifier 2017-12-31 11:10:01 -07:00
Daniel Wallace
8cb15ec689
download xml for junit 2017-12-29 15:00:54 -07:00
Daniel Wallace
d9e868ebd0
use new runtests verifier 2017-12-29 14:23:59 -07:00
Mike Place
27e80e4627
Merge branch 'develop' into add-cloud.vmware.convert_to_snapshot-feature 2017-11-13 11:28:27 -07:00
rallytime
1c3cb5c6a4
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - .gitignore
  - tests/unit/states/test_file.py
 2017-10-25 10:04:08 -04:00
Daniel Wallace
255118cfd7
run tests with kitchen 2017-10-24 09:23:44 -06:00
Daniel Wallace
b8c800e4a7
start adding kitchen to test suites 2017-10-17 14:59:10 -06:00
Daniel Wallace
51eca1a6bd
enable tox for tests 2017-10-03 17:01:19 -06:00