valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
93,268 Commits 24 Branches 182 Tags 341 MiB
3e59dda0b1
Commit Graph

4607 Commits

Author SHA1 Message Date
rallytime
3e59dda0b1
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-07-03 16:09:28 -04:00
rallytime
4c691ac57a
Add regression test for Issue #48230 
This also tests the fix for issue #38914
 2018-07-02 16:56:49 -04:00
rallytime
c4fd2a0930
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/rabbitmq.py
  - tests/integration/modules/test_pip.py
 2018-06-30 09:33:21 -04:00
Nicole Thomas
89857ea8b9
Merge pull request #48297 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-30 08:57:34 -04:00
Nicole Thomas
34b24bb7fa
Merge branch '2018.3' into issue47937 2018-06-27 13:41:34 -04:00
Nicole Thomas
21ed5b97ce
Merge pull request #48295 from rallytime/bp-48193 
Back-port #48193 to 2017.7
 2018-06-26 19:42:17 -04:00
Nicole Thomas
caf630487c
Merge pull request #48207 from rallytime/bp-48189 
Back-port #48189 to 2017.7
 2018-06-25 15:26:55 -04:00
rallytime
1c8bd35f28
Update old utils paths to use new utils paths 2018-06-25 10:45:24 -04:00
rallytime
c7bb8a50b0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/x509.py
  - salt/runners/cloud.py
  - tests/unit/modules/test_state.py
 2018-06-25 10:41:06 -04:00
Thomas Jackson
c0180ff33d
Properly configure syndic in test case 
Without this option we aren't really a syndic and it won't wait
 2018-06-25 10:26:30 -04:00
rallytime
e9d09e0375
Use old is_windows utils path on 2017.7 2018-06-25 10:06:37 -04:00
Gareth J. Greenaway
aea4f7ae14
Fixing test_local_batch 2018-06-24 16:03:47 -07:00
Gareth J. Greenaway
ce3e1eaf2c
Removing sort. 2018-06-23 11:25:46 -07:00
Gareth J. Greenaway
83accf3b20
Fixing test_local_batch 2018-06-22 12:19:41 -07:00
Gareth J. Greenaway
85cef126e0
Adding note about why salt.utils.versions is being re-imported. Adding a test for local_batch. 2018-06-22 12:19:40 -07:00
Nicole Thomas
51928ff050
Merge pull request #48166 from terminalmage/salt-jenkins-1000 
Add trace logging and optimize file handling in grains.core.os_data
 2018-06-21 14:02:32 -04:00
Daniel A. Wozniak
70c603451b
Fix py2 thin dir issues 2018-06-20 17:16:30 -07:00
Daniel Wallace
b965d6c9b3
If pip binary is passed to bin_env, use that pip binary 
We don't need to do a lookup for python to then run `python -m pip`
because we already know where pip is.

Fixes using /bin/pip3

Fixes #48122
 2018-06-19 14:09:11 -04:00
Nicole Thomas
96f79b0674
Merge pull request #48189 from gtmanfred/pip 
If pip binary is passed to bin_env, use that pip binary
 2018-06-19 14:08:12 -04:00
Daniel Wallace
96c59f3d93
If pip binary is passed to bin_env, use that pip binary 
We don't need to do a lookup for python to then run `python -m pip`
because we already know where pip is.

Fixes using /bin/pip3

Fixes #48122
 2018-06-18 16:21:58 -05:00
Alexey Aksenov
9ed2d2ec55 Fix integration.shell.test_key and integration.shell.test_runner 2018-06-18 17:39:35 +03:00
Alexey Aksenov
26a6f79730 Fix integration tests test_list_acc_wrong_eauth, test_salt_run_with_wrong_eauth 2018-06-18 17:39:23 +03:00
Erik Johnson
2c64b270df
Add timestamp to the minion's log_fmt_console 
This makes salt-call show timestamps in stdout/stderr when run from
integration tests (e.g. in ShellCase.run_script).
 2018-06-18 00:16:02 -05:00
Max Arnold
3d4fcbe3aa Add test for issue #48145 2018-06-15 23:48:14 +07:00
Nicole Thomas
b10b7355a0
Merge pull request #48054 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-13 08:58:45 -04:00
Daniel Wallace
d8c035e5e5
mark test as expensive 
This tests takes a large amount of cpu to run, and is causing tests to
hang.

Mark it as an expensive test so it only runs with the cloud tests.
 2018-06-11 16:08:10 -05:00
rallytime
508d70fabf
Update old utils paths to use new paths 2018-06-11 11:49:10 -04:00
rallytime
3d2ea16c3a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/base.txt
  - salt/states/archive.py
  - salt/states/file.py
  - tests/integration/runners/test_state.py
  - tests/unit/daemons/test_masterapi.py
 2018-06-11 11:45:37 -04:00
Erik Johnson
b33a0b5eaa
Switch to trace level logging for further test failure troubleshooting 2018-06-08 17:06:49 -05:00
Mike Place
ea85f882bc
Merge pull request #47915 from garethgreenaway/state_runner_pause_resume_kill 
[2018.3] state runner pause resume kill
 2018-06-07 10:08:29 -06:00
Gareth J. Greenaway
f457f9cb84
Adding a test to ensure archive.list returns the right results when a tar file contains a file with unicode in it's name. 2018-06-06 21:23:28 -07:00
Gareth J. Greenaway
4377e0cc08
Some fixes to the set_pause and rm_pause function in the state runner, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality. 2018-06-06 13:52:45 -07:00
Nicole Thomas
42dd6b83eb
Merge pull request #47978 from twangboy/fix_test_pkg 
Add try/finally, fix typo in 7zip def file
 2018-06-06 15:06:03 -04:00
Nicole Thomas
a67b21ef3d
Merge pull request #47959 from twangboy/fix_test_service 
Fix failing test when service doesn't exist
 2018-06-06 15:05:42 -04:00
Gareth J. Greenaway
7b7fb1f5d5
Adding missing test sls file. 2018-06-06 09:00:42 -07:00
Gareth J. Greenaway
54e51bc627
Backporting #47843 to 2017.7, updating test for 2017.7. 2018-06-06 09:00:42 -07:00
Erik Johnson
41e5a75027
Add catch_timeout to run_script 
One of the tests depends on forcing a timeout, but since we no longer
include the timeout message in the stdout/stderr return, we needed a way
to return whether or not the script timed out.
 2018-06-06 09:04:09 -05:00
twangboy
8bb36b3a4b
Add try/finally, fix typo in 7zip def file 2018-06-05 13:29:49 -06:00
Erik Johnson
4a8260a5e5
Add tests for git.cloned state 2018-06-05 12:32:40 -05:00
twangboy
0cd47aa81e
Remove unused import 2018-06-04 18:12:16 -06:00
twangboy
d4b42540e3
Fix failing test when service doesn't exist 2018-06-04 18:09:12 -06:00
Nicole Thomas
a46e42ab11
Merge pull request #47927 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-04 14:55:11 -04:00
Erik Johnson
9c369c6aa8
Remove temp logging from test 
It's now being logged in run_script itself
 2018-06-04 00:19:30 -05:00
Erik Johnson
fb66368af9
Update test logging for salt-jenkins 1000 2018-06-02 21:39:17 -05:00
rallytime
7e1d278d19
Update old utils paths to use new utils paths 2018-06-01 15:00:46 -04:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
 2018-06-01 14:54:12 -04:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings 
Well, all but one, which we expect to see
 2018-05-31 15:28:25 -05:00
Nicole Thomas
ae73cb3947
Merge pull request #47899 from terminalmage/salt-jenkins-1000 
salt-jenkins issue 1000
 2018-05-31 14:24:48 -04:00
Nicole Thomas
8f78e3aef6
Merge pull request #47753 from Ch3LL/service_mac 
Add stderr launchctl helper class and fix service mac tests
 2018-05-31 14:16:57 -04:00
Nicole Thomas
b4bac9b41b
Merge pull request #47868 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-30 17:20:37 -04:00