valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
91,440 Commits 24 Branches 182 Tags 341 MiB
e8864b7b0b
Commit Graph

606 Commits

Author SHA1 Message Date
rallytime
e8864b7b0b
Merge branch '2017.7' into '2018.3' 2018-03-28 13:52:28 -04:00
rallytime
e312efb5e7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/modules/cmdmod.py
  - salt/modules/pillar.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/pkg/rpm.py
  - salt/utils/schedule.py
  - tests/integration/states/test_npm.py
  - tests/integration/states/test_pkgrepo.py
 2018-03-27 16:31:55 -04:00
Erik Johnson
6502b6b4ff
Make busybox image builder work with newer busybox releases 2018-03-27 10:55:52 -05:00
rallytime
00d4eb26f3
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - pkg/windows/req.txt
 2018-03-27 11:41:56 -04:00
Gareth J. Greenaway
d2672f0db9
Adding issue-46672.sls for new state.py test. 2018-03-24 10:07:50 -07:00
Gareth J. Greenaway
152c43c843
Accounting for a case when multiple onfails are used along with requires. Previously if you have multiple states using 'onfail' and two of those states using a 'require' against the first one state, the last two will run even if the 'onfail' isn't met because the 'require' is met because the first state returns true even though it didn't excute. This change adds an additional hidden variable that is used when checking requisities to determine if the state actually ran. 2018-03-15 17:45:42 -07:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-15 17:22:05 -04:00
Nicole Thomas
7cdb00ca9c
Merge pull request #46398 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-03-12 16:25:18 -04:00
Nicole Thomas
22d753364b
Merge pull request #46337 from gtmanfred/2017.7 
Fix using names with listen and listen_in
 2018-03-12 14:49:59 -04:00
Benjamin Drung
3d37eca847 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 19:14:42 +01:00
rallytime
d83727fdf9
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/cli/api.py
  - salt/client/ssh/wrapper/state.py
  - salt/config/__init__.py
  - salt/crypt.py
  - salt/daemons/masterapi.py
  - salt/key.py
  - salt/loader.py
  - salt/master.py
  - salt/modules/archive.py
  - salt/modules/hipchat.py
  - salt/modules/pip.py
  - salt/modules/state.py
  - salt/modules/virt.py
  - salt/modules/x509.py
  - salt/state.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/__init__.py
  - salt/utils/event.py
  - salt/utils/extmods.py
  - salt/utils/files.py
  - salt/utils/parsers.py
  - salt/utils/verify.py
  - tests/integration/shell/test_call.py
  - tests/unit/utils/test_args.py
 2018-03-06 13:45:59 -05:00
Daniel Wallace
d6d9e36359
add tests for names and listen/listen_in 
Closes #30115
 2018-03-05 12:15:23 -07:00
Nicole Thomas
88b5f7383d
Merge pull request #46242 from redbaron4/fix-46127 
Pass env_vars to pip.freeze
 2018-03-05 09:53:12 -05:00
Ch3LL
d4893eab4c
Add username/password to profitbricks conf for cloud tests 2018-02-28 17:09:28 -05:00
Dheeraj Gupta
08d1ee8baf Fix Python3 test errors 2018-02-28 16:44:29 +05:30
Dheeraj Gupta
aa9d709015 Pass env_vars to pip.freeze 
pip.installed state calls pip.freeze to check for existing installation
and to verify installation post-install. This patch propagates the
env_vars passed to pip.installed to the pip.freeze function. It also modifies
existing pip unit tests to test new functionality and adds an integration test
that verifies the expected correct behavior

Fixes #46127
 2018-02-28 16:44:20 +05:30
rallytime
776f2ea5d7
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - salt/pillar/file_tree.py
  - tests/unit/modules/test_yumpkg.py
 2018-02-26 11:01:42 -05:00
Daniel Wallace
9ce14b2a12
pass opts to SSHClient for enable_ssh_minions 
Also, use ckminions to get the minions from the roster, instead of doing it in
publish.
 2018-02-20 16:06:00 -07:00
rallytime
e060a74fd8
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/cloud/clouds/dimensiondata.py
  - salt/config/__init__.py
  - salt/modules/yumpkg.py
  - salt/pillar/ec2_pillar.py
  - salt/utils/docker/__init__.py
  - salt/utils/vault.py
  - tests/integration/states/test_docker_container.py
  - tests/unit/modules/test_yumpkg.py
  - tests/unit/templates/test_jinja.py
  - tests/unit/utils/test_docker.py
 2018-02-14 16:31:31 -05:00
Nicole Thomas
007214f7bf
Merge pull request #45908 from DimensionDataResearch/fix/issue/45884 
Fix for #45884 ("TypeError: can't serialize <NodeImage" when calling salt-cloud with the dimensiondata driver)
 2018-02-12 17:05:28 -05:00
Erik Johnson
0ff41c5835
Add regression test for issue 45893 2018-02-09 11:40:22 -05:00
Adam Friedman
a2bc155c73
Use __utils__['cloud.'] instead of salt.cloud.utils. 
saltstack/salt#45884
 2018-02-08 08:39:33 +11:00
Adam Friedman
6b1b6be427
Add integration tests for dimensiondata cloud provider. 
saltstack/salt#45884
 2018-02-08 08:38:58 +11:00
Daniel Wallace
e892f75660
fix digital ocean tests 2018-02-07 14:04:37 -07:00
Erik Johnson
9d200efc26
Add regression test for issue 45893 2018-02-07 14:32:59 -06:00
Erik Johnson
6cef37f310
2 unicode-compatibility fixes for cmdmod.py 
First, `shlex.split()` will raise an exception when passed a unicode
type with unicode characters in the string. This modifies our
`shlex.split()` helper to first convert the passed string to a `str`
type, and then return a decoded copy of the result of the split.

Second, this uses our `to_unicode` helper to more gracefully decode the
stdout and stderr from the command. Unit tests have been added to
confirm that the output is properly decoded, including instances where
decoding fails because the return from the command contains binary data.
 2018-02-07 02:01:55 -06:00
Erik Johnson
0d92e0a868
Add a test for issue 40578 2018-01-30 09:51:51 -06:00
Erik Johnson
629e6c9674
Further fixes to for salt-ssh test under heavy load 
This makes some further tweaks to make the test more stable under heavy
load. Firstly, the background job sleeps longer, and secondly, we make
up to 3 attempts run state.running instead of just the one, in case our
first attempt was too early. It also uses threading to make the job
sleep, since the method of adding a & to the command seemed to be
producing intermittent failures with returning clean JSON.
 2018-01-22 07:33:42 -05:00
Nicole Thomas
d48230a9e6
Merge pull request #45582 from terminalmage/salt-ssh-fixes 
Two salt-ssh fixes
 2018-01-22 07:31:43 -05:00
Erik Johnson
2817101041
Further fixes to for salt-ssh test under heavy load 
This makes some further tweaks to make the test more stable under heavy
load. Firstly, the background job sleeps longer, and secondly, we make
up to 3 attempts run state.running instead of just the one, in case our
first attempt was too early. It also uses threading to make the job
sleep, since the method of adding a & to the command seemed to be
producing intermittent failures with returning clean JSON.
 2018-01-21 21:19:53 -06:00
Erik Johnson
c27bb7c116
[PY3] Update fileserver for Unicode/PY3 compatibility 
This adds a unicode_literals import to the fileserver code, and also ensures
that we return unicode paths from the serialized file/env list caches
(which when deserialized are still encoded str types on PY2).

It also adds a test and modifies a few other existing tests to confirm
that unicode paths/envs are returned *as unicode* in the return data.
 2018-01-20 22:25:23 -06:00
Nicole Thomas
4d03162227
Merge pull request #45396 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2018-01-14 07:44:37 -05:00
Ch3LL
62035a04ff
update provider rackspace config 2018-01-12 12:02:01 -05:00
Ch3LL
40677cad21
migrate rackspace to openstack in cloud test 2018-01-12 11:08:28 -05:00
Ch3LL
f7cf8b6e94
Change rackspace provider name for >=oxygen cloud tests 2018-01-12 10:55:31 -05:00
rallytime
60370f5fb6
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/proxy/dummy.py
  - salt/states/file.py
  - tests/integration/modules/test_state.py
  - tests/integration/runners/test_runner_returns.py
  - tests/integration/ssh/test_state.py
  - tests/support/parser/__init__.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_file.py
 2018-01-11 16:00:08 -05:00
twangboy
0356b3d56f
Backport changes from #45308 2018-01-11 15:36:38 -05:00
Nicole Thomas
2340f0b487
Merge pull request #45380 from twangboy/backport_45308 
Backport changes from #45308
 2018-01-11 14:45:20 -05:00
Daniel Wallace
3cb91b4d63
disable discovery in test suite 2018-01-11 09:58:14 -07:00
twangboy
419be8a9b5
Backport changes from #45308 2018-01-10 11:16:59 -07:00
Erik Johnson
3565bc2bf2
Don't use include-test SLS in orch tests 
This was the _actual_ cause of the failing test in the state module
integration tests.
 2018-01-10 10:29:15 -05:00
Erik Johnson
8bc17e0d7a
Fix integration.modules.test_state.StateModuleTest.test_exclude 
test_exclude shares file paths with test_include, and while I can't
reproduce the failures, it is likely that improperly cleaned-up files
from test_include are causing the failures in test_exclude. This is
backed up by the fact that the state.sls return data from the
salt-runtests.log shows no trace of the "to-include-test" file
(suggesting it was excluded as expected), yet os.path.isfile() returns
True for this path, causing the test to fail.

This commit uses a distinct base dir for both tests, which should keep
this sort of failure from happening.
 2018-01-10 10:29:15 -05:00
twangboy
e3e0dba15d
Fix failing ubuntu test 2018-01-09 21:30:51 -07:00
twangboy
53506a5e86
Fix some additional tests 
- Fix problem with invalid characters in requisites.prereq_simple2
- Fix problem with true/false commands in Windows. Need to use exit
- Fix some issues with hard-coded paths to /tmp
 2018-01-09 16:50:29 -07:00
Nicole Thomas
8d04c2b3d4
Merge pull request #44856 from Ch3LL/running_test 
Add state.running ssh integration test
 2018-01-08 16:40:49 -05:00
Erik Johnson
0d975c335d
Add unicode_literals to engines 2018-01-07 14:01:48 -06:00
rallytime
a3d251b2cd
Merge branch '2016.11' into '2017.7' 2018-01-02 15:21:58 -05:00
Daniel Wallace
2d0a9bbf7e
enable UsePAM for ssh tests 2018-01-02 12:29:43 -05:00
rallytime
da1e33abea
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - pkg/windows/req_base.txt
  - salt/engines/slack.py
  - salt/modules/cmdmod.py
  - salt/modules/osquery.py
  - salt/modules/pip.py
  - salt/modules/win_pkg.py
  - salt/states/pip_state.py
  - tests/integration/modules/test_cmdmod.py
 2017-12-30 08:44:11 -05:00
Daniel Wallace
0495c0de7f
enable UsePAM for ssh tests 2017-12-28 15:41:25 -07:00