valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,156 Commits 24 Branches 182 Tags 341 MiB
7acc6949c6
Commit Graph

3224 Commits

Author SHA1 Message Date
Thomas S Hatch
1468c26ec1 Merge branch '2014.7' into develop 
Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
 2014-10-13 15:03:33 -06:00
Thomas S Hatch
b2e730a2a6 Merge pull request #16158 from thatch45/pillar_opts_false 
Set pillar_opts to default to False
 2014-10-13 14:33:44 -06:00
Thomas S Hatch
ef83ad23c3 Merge pull request #16579 from s0undt3ch/hotfix/vt-fixes 
More VT fixes
 2014-10-13 14:23:11 -06:00
Pedro Algarvio
e683619f9f Having data left to read does not mean the process is alive 2014-10-13 17:19:42 +01:00
Thomas S Hatch
251a036938 Set the tests to still asume pillar_opts 2014-10-13 08:58:20 -06:00
Mathieu Le Marec - Pasquet
7fe9a5e612 pep8 2014-10-12 12:16:07 +02:00
Mathieu Le Marec - Pasquet
a0aa6eee89 display traceback in test error 2014-10-12 11:37:28 +02:00
Pedro Algarvio
4470c0dc68 White-space lint fix 2014-10-12 04:29:59 +01:00
Pedro Algarvio
51479e4592 Include a test case in order to check for full output from VT 2014-10-12 03:37:08 +01:00
Pedro Algarvio
743c26e562 Instead of checking for a live process, check for unread data. 
Add a unit test which tests proper behaviour.

Fixes #15941
 2014-10-12 02:28:35 +01:00
Pedro Algarvio
41870ef3e0 Fix ensure in syspath call 2014-10-12 02:16:23 +01:00
Pedro Algarvio
4fca1c96da Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00
Pedro Algarvio
52d0d01d09 Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00
Pedro Algarvio
e9fbd9910d Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00
Pedro Algarvio
8d9570ef43 Set the cachedir to a relative path 2014-10-12 02:16:23 +01:00
Mathieu Le Marec - Pasquet
43fce63b5c Another fix for outputter reliability 2014-10-11 18:37:35 +02:00
rallytime
7e09896c7c Clean up boto_secgroup unit test 
This test required some tweaks as there are new versions of boto and moto
 2014-10-10 16:35:08 -06:00
rallytime
e15bf67fba Clean up boto_secgroup unit test 
This test required some tweaks as there are new versions of boto and moto
 2014-10-10 16:03:21 -06:00
rallytime
2c513cf2bb Remove print from tests 2014-10-09 10:33:34 -06:00
Seth House
b0615f9bbf Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-08 14:40:32 -06:00
Gareth J. Greenaway
9ae138e1a4 Fixing the unit tests for ps module 2014-10-07 20:56:02 -07:00
Pedro Algarvio
8e93faa072 Fix lint errors 2014-10-08 01:02:11 +01:00
Pedro Algarvio
ff97810661 Load configs from scratch 2014-10-08 01:02:10 +01:00
Pedro Algarvio
ab6a54dbf5 The runtime client gets an unfreeze version of the configs 2014-10-08 01:02:10 +01:00
Pedro Algarvio
5e4eb4bbaf Don't add tests in __init__ 2014-10-08 01:02:10 +01:00
Pedro Algarvio
e739561728 Use the salttesting skip helpers 2014-10-08 01:02:10 +01:00
Pedro Algarvio
d569f0811e Let's go wild and cache the local client as reusable a runtime global instance 2014-10-08 01:02:10 +01:00
Pedro Algarvio
7cab740adf Removed --runner because it's integrated in the client tests 2014-10-08 01:02:10 +01:00
Pedro Algarvio
3de914e556 Move tests away from __init__ 2014-10-08 01:02:08 +01:00
Pedro Algarvio
dee2c91fde Test the runner client under tests/integration/clients 2014-10-08 01:00:20 +01:00
Pedro Algarvio
d0ca8274ae Remove the unnecessary integration.ClientCase class 2014-10-08 01:00:19 +01:00
Pedro Algarvio
b32d86d0f4 Allow getting the configuration from scratch. 
Properly handle `client_config` when loading from cache.
Only delete the `_client` attribute if it has been set.
 2014-10-08 01:00:06 +01:00
Pedro Algarvio
93e8b12b93 Try caching the client too 2014-10-08 00:57:22 +01:00
Pedro Algarvio
bbc9120471 The syndic_config call needs the path to the minion config file 2014-10-08 00:57:22 +01:00
Pedro Algarvio
4d047a67f5 Handle more config filenames 2014-10-08 00:57:22 +01:00
Pedro Algarvio
3a3c6b06dd First attempt at caching the loaded configuration from the filesystem. 
This basically should avoid loading and parsing YAML over and over again.
 2014-10-08 00:57:22 +01:00
Seth House
dd400f2e96 Added integration tests WheelClient cmd_sync cmd_async 2014-10-07 16:43:15 -06:00
rallytime
6212cfba12 Fix assertion messages to match and pass tests 2014-10-07 09:36:04 -06:00
rallytime
d8e7feafce Clean up last expectedFailure 2014-10-07 08:42:31 -06:00
rallytime
5ff51987b9 Pylint fix 2014-10-07 08:31:42 -06:00
rallytime
868a6e5459 Change expectedFailures to @skipIfs 2014-10-07 08:13:09 -06:00
rallytime
116c29b135 Fix unittest.case import 2014-10-06 21:24:46 -06:00
rallytime
6a1da81a99 Pylint fix 2014-10-06 20:48:00 -06:00
rallytime
274c61b694 Add docstrings to boto_vpc unit tests 2014-10-06 16:52:57 -06:00
Thomas S Hatch
74bc3b8796 Merge pull request #16095 from thedrow/feature/vpc 
[WIP] AWS VPC module improvements
 2014-10-06 10:12:07 -06:00
Seth House
9bd61a1bd6 Added integration tests for wildcard eauth usernames 2014-10-03 13:28:29 -06:00
Seth House
12b1ba289a Added a wildcard eauth user for testing 2014-10-03 13:28:29 -06:00
Colton Myers
8dca840248 Remove unused imports 2014-10-03 13:25:04 -06:00
Seth House
d0366eaf50 Added unit test for running arguments through the RunnerClient 2014-10-03 13:25:04 -06:00
Seth House
0d07099444 Added integration tests for wildcard eauth usernames 2014-10-02 23:53:37 -06:00
Seth House
a5d861314b Added a wildcard eauth user for testing 2014-10-02 19:21:51 -06:00
Colton Myers
0ffec8f6d3 Merge pull request #16327 from basepi/bp-16322 
Backport #16322 to 2014.7
 2014-10-02 15:33:45 -06:00
Colton Myers
0edf446903 Remove unused imports 2014-10-02 13:52:24 -06:00
Seth House
dbe2fe5c92 Added unit test for running arguments through the RunnerClient 2014-10-02 12:00:01 -06:00
Tarjei Husøy (via Travis CI)
25ea6060b7 Replace random.randint() with os.urandom() 2014-10-02 10:20:20 -06:00
Tarjei Husøy (via Travis CI)
ea06fb21cb Replace random.randint() with os.urandom() 2014-10-02 15:21:26 +02:00
Omer Katz
f5c92d70ff Fixed possible test module import failure when boto is not installed. 2014-10-02 15:01:49 +03:00
Omer Katz
5620eddb2d Removed unused import. 2014-10-02 14:32:51 +03:00
Omer Katz
430fea55e2 Added missing check for arguments in route_table_exists(). 2014-10-02 14:26:40 +03:00
Omer Katz
f7bb4b3b67 Added missing check for arguments in network_acl_exists and fixed DHCP options test. 2014-10-02 14:26:39 +03:00
Omer Katz
02654ce0d4 Added missing check for arguments in dhcp_options_exists. 2014-10-02 14:26:39 +03:00
Omer Katz
b0f11e2e70 Added missing check for arguments in subnet_exists. 2014-10-02 14:26:39 +03:00
Omer Katz
2514d3824b Addressing review from @ryan-lane. exists will now raise a SaltInvocationError when arguments are not specified. 2014-10-02 14:26:39 +03:00
Omer Katz
1233e9e2e6 Added the ability to check for existence of subnets by name or tags. 2014-10-02 14:26:39 +03:00
Omer Katz
ab950936e1 Verified that when providing no filters the vpc_exists method returns false. 2014-10-02 14:26:39 +03:00
Omer Katz
3c03cefb3a Added support for filtering vpcs by name or tags. 2014-10-02 14:26:39 +03:00
Omer Katz
1bfff3a573 Rename test names. 2014-10-02 14:26:39 +03:00
Omer Katz
f07d1bf9f2 Fixed some lint errors. 2014-10-02 14:26:39 +03:00
Omer Katz
1fc37e22b6 DHCP tests will now be skipped correctly. 2014-10-02 14:26:39 +03:00
Omer Katz
b3f3b96ff7 Fixed test name. 2014-10-02 14:26:39 +03:00
Omer Katz
e0200ccd56 Skip DHCP tests for now. 2014-10-02 14:26:39 +03:00
Omer Katz
dbadd0b474 Added the ability to replace routes. Fixed failing tests. 2014-10-02 14:26:38 +03:00
Omer Katz
98e669e2f1 Added the ability to delete routes. 2014-10-02 14:26:38 +03:00
Omer Katz
ff48e4aebf Added the ability to create routes. 2014-10-02 14:26:38 +03:00
Omer Katz
4110fb06eb Added the ability to associate route tables. 2014-10-02 14:26:38 +03:00
Omer Katz
40230406fb Added the ability to disassociate a route table. 2014-10-02 14:26:38 +03:00
Omer Katz
dc377b9ece Added the ability to disassociate network acl. 2014-10-02 14:26:38 +03:00
Omer Katz
4e5d07e926 Added the ability to check for existence of route tables. 2014-10-02 14:26:38 +03:00
Omer Katz
312fa78c31 Fixed route table tests. 2014-10-02 14:26:38 +03:00
Omer Katz
f3538b40d2 Added the ability to delete route tables. 2014-10-02 14:26:38 +03:00
Omer Katz
a8e9fcaa3e Added the ability to create route tables. 2014-10-02 14:26:38 +03:00
Omer Katz
5abbc62ccf Added the ability to associate a network acl to a subnet and to create it and associate it in one operation. 2014-10-02 14:26:38 +03:00
Omer Katz
69f7d7c3b1 Added the ability to tag network acls. 2014-10-02 14:26:38 +03:00
Omer Katz
8d48df06c7 Added the ability to create/delete/replace network acl entries. Tests will fail correctly since moto doesn't support faking network acls yet. 2014-10-02 14:26:38 +03:00
Omer Katz
a8c6288196 Added the ability to create/delete/check for existence of network acl. Tests will fail correctly since moto doesn't support faking network acls yet. 2014-10-02 14:26:38 +03:00
Omer Katz
97cd112fcf Refactoring the test module since it's getting bigger. 2014-10-02 14:26:37 +03:00
Omer Katz
b5aaa2b3e8 Added unit tests that verify that dhcp options creation and association reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
0bae036a21 Added unit tests that verify that dhcp options existence reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
f943fb9364 Fixed the subnet exists test. 2014-10-02 14:26:37 +03:00
Omer Katz
450a5a4570 Added unit tests that verify that subnet existence reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
18e913a41f Added the ability to tag ec2 objects. 2014-10-02 14:26:37 +03:00
Omer Katz
888e2ce35e Fixed typo. 2014-10-02 14:26:37 +03:00
Omer Katz
fb9d1dbafe Verifyed that all ec2 objects can be named. 2014-10-02 14:26:37 +03:00
Omer Katz
8bbaf96f6e Added unit tests that verify that DHCP association reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
2ed1957427 Added unit tests that verify that DHCP creation reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
b202bcbe04 Allowed tagging a VPC with a name if required. 2014-10-02 14:26:37 +03:00
Omer Katz
86e484fac8 Fixed docstrings. 2014-10-02 14:26:37 +03:00
Omer Katz
e27d82dd3d Added unit tests that verify that subnet deletion reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
f64b9d57b5 Fixed typo. 2014-10-02 14:26:37 +03:00
Omer Katz
869cfe580d Added unit tests that verify that vpc deletion reports success/failure correctly. 2014-10-02 14:26:37 +03:00
Omer Katz
4004f09cd0 Refactoring the test suite. 2014-10-02 14:26:36 +03:00
Omer Katz
e4f8340201 Added unit tests that verify that subnet creation reports success/failure correctly. 2014-10-02 14:26:36 +03:00
Omer Katz
78def8c70b Added unit tests that verify that vpc creation reports success/failure correctly. 2014-10-02 14:26:36 +03:00
rallytime
8e55094ecd Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/influx.py
 2014-10-01 10:12:06 -06:00
Thomas S Hatch
37267f76b9 Merge pull request #16276 from jacksontj/2014.7 
Ensure that timeout will happen for jobs that don't target any alive minions
 2014-09-30 16:24:19 -06:00
Thomas S Hatch
1cfd7f7d66 Merge branch '2014.7' into develop 
Conflicts:
	salt/netapi/rest_tornado/saltnado.py
 2014-09-30 11:40:15 -06:00
Thomas Jackson
d9fdc06742 Ensure that timeout will happen for jobs that don't target any alive minions 
Instead of checking if all returns are in, we should check that the job is not running anywhere then enforce the per-minion timeout. I've added a test case for the instance where there is a job fired to a minion that will never return (before it would stall forever)
 2014-09-30 10:11:55 -07:00
Steve Weber
a0c3723c96 removed the slash when using slspath 2014-09-30 10:51:36 -06:00
Thomas S Hatch
5d895123e0 Merge pull request #16252 from steverweber/slspath 
removed end slash on slspath
 2014-09-29 20:04:40 -06:00
Thomas Jackson
98af66bbf3 Add a regression test for #16240 2014-09-29 16:37:53 -07:00
Steve Weber
6d1c32e254 removed the slash when using slspath 2014-09-29 19:18:10 -04:00
Thomas S Hatch
7700b6c55a Merge branch '2014.7' into develop 2014-09-29 13:46:10 -06:00
Erik Johnson
e37b337a56 Add unity manpage to buildpackage spec 
This fixes automated package builds in jenkins
 2014-09-29 13:35:50 -05:00
vs
648a860b5b more cleanup for FSCache-removal 2014-09-27 00:59:55 +02:00
Colton Myers
3e741d7a98 Merge branch '2014.7' into develop 2014-09-25 16:37:35 -06:00
rallytime
b891ef12f0 Skip test_vt_size unit test 2014-09-25 15:38:01 -06:00
Thomas S Hatch
a90fc60a82 Merge branch '2014.7' into develop 2014-09-25 14:23:54 -06:00
Pedro Algarvio
227c62b4ee Merge pull request #16149 from rallytime/improve_loader_test 
Fix linode test failures and test all modules
 2014-09-25 20:38:06 +01:00
Colton Myers
7f551d48b4 Merge branch '2014.7' into develop 2014-09-25 13:09:19 -06:00
rallytime
210adceeff Actually, just fix pylint 2014-09-25 12:36:00 -06:00
rallytime
e2dce8acba Skip ssh grains test for now. Test environment isn't set up to handle it. 2014-09-25 11:47:44 -06:00
rallytime
ac40a5b2da Fix linode test failures and test all modules 2014-09-25 11:34:50 -06:00
Thomas S Hatch
3198a17193 Merge branch '2014.7' into develop 
Conflicts:
	salt/master.py
	salt/minion.py
	salt/modules/hg.py
	salt/utils/process.py
 2014-09-25 09:08:14 -06:00
Daniel Mizyrycki
e0c6c8c22a salt-ssh, issue #16129: 
Add integration/regression test for issue affecting grains and pillar subsystem.
 2014-09-24 20:58:37 -07:00
Thomas S Hatch
3ce955c774 Merge branch '2014.7' into develop 
Conflicts:
	salt/cloud/deploy/bootstrap-salt.sh
 2014-09-24 12:46:37 -06:00
Thomas S Hatch
1427a56e15 Merge pull request #16077 from drawks/parted_tests 
salt.modules.parted.list_ tweaks and tests
 2014-09-24 11:51:22 -06:00
Thomas S Hatch
43272781f1 Merge pull request #15933 from felskrone/list_denied_minions 
List denied minions
 2014-09-24 09:34:19 -06:00
vs
af070a56ad its 'Denied Keys', not 'Denied Minions' 2014-09-24 14:10:49 +02:00
Thomas S Hatch
ee9bf6c6cc Merge pull request #16062 from rallytime/fix_ec2_tests 
Fix the ec2 cloud provider tests
 2014-09-23 17:16:10 -06:00
Colton Myers
76d5fdb41f Revert "Change timeout for CLI returns" 2014-09-23 16:44:37 -06:00
Dave Rawks
9b761f378d More test coverage for salt.modules.parted 
* Full coverage for "list_" method
 2014-09-23 15:44:33 -07:00
Thomas S Hatch
8c72baa660 Merge pull request #15942 from jacksontj/develop 
Change timeout for CLI returns
 2014-09-23 15:40:34 -06:00
Thomas Jackson
c77e2d36ae Pylint fix 2014-09-23 14:37:34 -07:00
rallytime
9fc915e639 Remove 'running' check - it's not reliable 2014-09-23 15:06:08 -06:00
rallytime
1c9e062c78 Fix the ec2 cloud provider tests 2014-09-23 14:55:56 -06:00
Thomas S Hatch
3f82e3664a Merge branch '2014.7' into develop 2014-09-23 14:41:58 -06:00
Thomas S Hatch
3ce4387f3f Merge pull request #16001 from thatch45/ssh_fsclient 
Ssh fsclient
 2014-09-23 14:41:28 -06:00
Thomas Jackson
ff0081b53d Remove "never timeout" feature 2014-09-23 13:35:11 -07:00
Thomas S Hatch
e2d640962a Fix Jinja test 2014-09-23 14:02:34 -06:00
vs
b804056b65 add expected output for denied minions to test_* 2014-09-23 17:36:06 +02:00
Pedro Algarvio
f547aeae41 Merge pull request #16033 from rallytime/fix_2014.7_tests 
Fix broken test on 2014.7
 2014-09-23 00:09:10 +01:00
Dave Rawks
a3707e2bab Simplify mock of cmd.run via setUp method 
* reduced code duplication by handling a frequently used mock in setUp
method to testcase
 2014-09-22 14:44:52 -07:00
Dave Rawks
8c0266486e Merge branch 'develop' of https://github.com/saltstack/salt into parted_tests 2014-09-22 11:35:41 -07:00
Dave Rawks
6e6bf0e643 First pass at adding unit tests to salt.modules.parted 
Full coverage for __virtual__, probe, and part_list
 2014-09-22 11:16:37 -07:00
rallytime
9c682933d4 Fix broken test on 2014.7 2014-09-22 12:13:10 -06:00
vs
ca5e63ed24 create minions_denied in test-env, update wheel-test to expect minions_denied 2014-09-22 19:44:24 +02:00
Arnold Bechtoldt
3e483523ff changing param back to backend in fileserver to improve useability 2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
94516433e7 fix integration test in fileserver runner, refs #16008 2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
b588245c1d extend fileserver runner with additional features 2014-09-22 11:16:26 -06:00
Thomas S Hatch
7355f53057 Add fileserver_backend to jinja tests local opts 2014-09-22 10:29:25 -06:00
Arnold Bechtoldt
043c29d518 changing param back to backend in fileserver to improve useability 2014-09-22 08:18:13 +02:00
Arnold Bechtoldt
6b251cbb05 fix integration test in fileserver runner, refs #16008 2014-09-21 21:19:03 +02:00
Arnold Bechtoldt
db5dde72cf extend fileserver runner with additional features 2014-09-21 20:16:41 +02:00
Thomas S Hatch
3fe53840c0 Merge pull request #15992 from rallytime/bp-15617 
Backport #15617 to 2014.7
 2014-09-19 21:41:29 -06:00
rallytime
936a6bca5a Fix mdadm tests 2014-09-19 16:35:43 -06:00
Pedro Algarvio
aed0178072 Correct --output-file-append test 2014-09-19 10:33:38 -06:00
Thomas Jackson
3815bbbfa8 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-09-19 08:11:31 -07:00
rallytime
4a740d876d Change ec2 profile name in config_test so test doesn't fail 2014-09-18 20:41:08 -06:00
rallytime
ffe00e0909 Update ec2 provider and profile config files for cloud nightly tests 2014-09-18 20:41:08 -06:00
rallytime
d861915d93 Add EC2 cloud test file 2014-09-18 20:41:08 -06:00
Thomas Jackson
4abe763591 Add tests for timeouts to client tests. In addition this makes all of the client functions have the same functionality 2014-09-18 14:38:13 -07:00
Thomas Jackson
a7e3586274 Add CLI timeout tests to standard client tests 2014-09-18 14:10:02 -07:00
Pedro Algarvio
8e3f9963cb Correct --output-file-append test 2014-09-17 19:40:58 +01:00
Erik Johnson
111a09f2ad Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	salt/minion.py
	salt/output/nested.py
 2014-09-16 18:46:48 -05:00
Erik Johnson
3f19d518fb Fix --define directive for Cent5 builds 2014-09-16 18:16:44 -05:00
Thomas S Hatch
4df1ba300c Merge pull request #15839 from jacksontj/develop 
Handle OSErrorin processmanager
 2014-09-16 15:05:07 -06:00
Thomas Jackson
29110d0a92 Cleanup, the function name changed 2014-09-16 13:22:55 -07:00
rallytime
064868b87a Fix test failures on develop 2014-09-16 12:23:06 -06:00
rallytime
85f82816c2 Revert "Put provider specific information only in provider configuration file" 
This reverts commit 1ccec204b2.
 2014-09-16 08:40:43 -06:00
rallytime
a5c658b337 Disable pylint unused import warning 2014-09-16 07:14:38 -06:00
rallytime
1ccec204b2 Put provider specific information only in provider configuration file 2014-09-16 07:08:18 -06:00
rallytime
2801dfbee4 Rename azure tests to match cloud module and add azure sdk import back in 2014-09-16 06:35:12 -06:00
rallytime
35793bd8d9 Pylint fix 2014-09-15 20:20:37 -06:00
rallytime
b30e750a8a Azure cloud tests 
Oh, and rename cloud.profiles.d/azure.sls to cloud.profiles.d/azure.conf
 2014-09-15 16:58:26 -06:00
rallytime
a30ccd2a7b Add cloud provider and profile configuration files 2014-09-15 15:57:27 -06:00
Colton Myers
8d0bf0ee95 Merge branch '2014.7' into develop 
Conflicts:
	salt/states/pip_state.py
 2014-09-15 11:49:04 -06:00
rallytime
e34157c70b Add skipIf import to fix the 2014.7 tests 2014-09-15 08:23:08 -06:00
Pedro Algarvio
a171a35c89 Disable test_issue_10404_ptys_not_released 
Disabled until we can find out why this kills the tests suite with an exit code of 134
 2014-09-14 23:54:38 +01:00
rallytime
2b3d4b8e6b Import function in syslog_ng_test so tests will run 2014-09-14 08:04:20 -06:00
Thomas S Hatch
4efc90ad92 Merge pull request #15743 from saltstack/temp-merge-forward 
Merge 2014.7 into develop
 2014-09-12 14:30:53 -06:00
Thomas S Hatch
d60804a709 lint fixes for #15695 2014-09-12 10:42:35 -06:00
Thomas S Hatch
5d27e77c92 Merge branch 'feature/postgres_schema' of https://github.com/novapost/salt into novapost-feature/postgres_schema 2014-09-12 10:39:40 -06:00
Colton Myers
e92dc99e9a Merge branch '2014.7' into temp-merge-forward 
Conflicts:
	salt/minion.py
 2014-09-12 10:37:24 -06:00
Thomas S Hatch
d6e3e01c6d Merge pull request #15392 from ihrwein/f/add-syslog-ng-modules 
F/add syslog ng modules
 2014-09-12 10:37:02 -06:00
Colton Myers
f3b5f122fb Merge pull request #15728 from rallytime/cleanup_integration 
Remove unused kwarg from _check_state_return
 2014-09-12 10:19:18 -06:00
Pedro Algarvio
080a06252a Merge pull request #15676 from rallytime/ec2_cloud_tests 
Ec2 cloud tests
 2014-09-12 08:23:51 +01:00
Erik Johnson
3ea1fe064e Add SRPM to build artifacts for automated RPM builds 2014-09-12 01:35:15 -05:00
Erik Johnson
53ce42428a Rename --dest-dir to --build-dir 
``--build-dir`` is a more accurate name. ``--dest-dir`` seems to suggest
that this is where the packages ultimately end up. While it's true that
the packages do end up within that directory, they are copied to the
artifact directory, from which they are ultimately retrieved by the
jenkins master.
 2014-09-12 01:35:08 -05:00
rallytime
6679f26736 Remove unused kwarg from _check_state_return 2014-09-11 23:32:51 -06:00
Erik Johnson
c69d47d062 Revert "Revert "Re-enable test run SLS"" 
This reverts commit fcfa1a244e and
re-enables tests in jenkins.py. They had been left commented out while I
was testing.
 2014-09-11 18:08:29 -05:00
Thomas S Hatch
6edfc3d281 Merge pull request #15558 from terminalmage/buildpackage 
Add automated RPM building to jenkins tests
 2014-09-11 16:44:27 -06:00
Erik Johnson
fcfa1a244e Revert "Re-enable test run SLS" 
This reverts commit 8bcc418aa2.
 2014-09-11 17:44:00 -05:00
Erik Johnson
8883f974a8 Add command-line options for package build options 
Also add these to pillar data so they make it to the buildpackage SLS
 2014-09-11 17:05:09 -05:00
Erik Johnson
8bcc418aa2 Re-enable test run SLS 
Now that the buildpackage stuff is ready, this no longer needs to be
commented out.
 2014-09-11 13:35:40 -05:00
Erik Johnson
cb31726500 Download packages only when buildpackage.py was run 2014-09-11 13:19:44 -05:00
Erik Johnson
e22c000d5c Create the build log in the artifact dir 
This allows the jenkins master to receive the log file even if the build
script aborted. Before I was just copying the log file to the artifact
dir at the end of the script, which meant that jenkins only gets the log
when the script succeeds.
 2014-09-11 13:08:40 -05:00
Erik Johnson
a146a80034 Fix tarfile name 2014-09-11 12:56:45 -05:00
Erik Johnson
2256dc786a Fix path to cached packages 2014-09-11 12:42:40 -05:00
Pedro Algarvio
da1fb62a67 Fix typo in comment 2014-09-11 18:18:39 +01:00
Erik Johnson
12ca973f10 Fix path for cp.push 2014-09-11 12:07:00 -05:00