rallytime
b49c677af8
Merge branch '2014.7' into merge_forward
...
Conflicts:
salt/daemons/flo/core.py
salt/daemons/salting.py
salt/minion.py
salt/modules/introspect.py
salt/modules/lxc.py
salt/modules/sysmod.py
salt/runners/doc.py
salt/states/cloud.py
salt/transport/__init__.py
salt/utils/github.py
2014-11-04 10:07:02 -07:00
rallytime
92fc46607f
Don't use HVM image type.
2014-11-03 16:12:21 -07:00
rallytime
e272c41bb8
Use Ubuntu 14 image for ec2 cloud tests instead of RHEL 6
2014-11-03 15:13:14 -07:00
Colton Myers
0cc0d64136
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/hg.py
2014-10-31 16:14:34 -06:00
Thomas Jackson
d2b548a0e7
Add regression test for #17051
2014-10-30 16:43:06 -07:00
Thomas Jackson
52f7216bea
Revert naming here too
2014-10-29 14:35:27 -07:00
Thomas Jackson
aabe6460f6
Misc comment cleanup in tests
2014-10-28 08:12:10 -07:00
rallytime
933be7c476
Merge branch '2014.7' into develop
...
Conflicts:
salt/master.py
salt/returners/mysql.py
salt/utils/cloud.py
salt/utils/minions.py
2014-10-25 08:54:42 -06:00
rallytime
f94cf6ad68
Change profile name for Digital Ocean cloud tests
...
Digital Ocean changed their image-naming scheme. This should fix the failing tests.
2014-10-24 16:14:02 -06:00
Pedro Algarvio
229eb00e8d
Merge branch '2014.7' forward into develop
...
Conflicts fixed.
Conflicts:
salt/loader.py
salt/returners/carbon_return.py
salt/returners/couchbase_return.py
salt/returners/couchdb_return.py
salt/returners/elasticsearch_return.py
salt/returners/local_cache.py
salt/returners/memcache_return.py
salt/returners/mongo_future_return.py
salt/returners/mongo_return.py
salt/returners/mysql.py
salt/returners/odbc.py
salt/returners/postgres.py
salt/returners/redis_return.py
salt/returners/smtp_return.py
salt/returners/sqlite3_return.py
salt/states/dockerio.py
salt/utils/minions.py
2014-10-19 18:21:19 +01:00
Daniel Mizyrycki
54738d0ff5
Added salt-ssh integration test for custom module within SLS
2014-10-17 15:39:49 -07:00
C. R. Oldham
d07ebe2105
Test for retcode
2014-10-14 13:28:19 -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
251a036938
Set the tests to still asume pillar_opts
2014-10-13 08:58:20 -06:00
Seth House
12b1ba289a
Added a wildcard eauth user for testing
2014-10-03 13:28:29 -06:00
Seth House
a5d861314b
Added a wildcard eauth user for testing
2014-10-02 19:21:51 -06:00
rallytime
ffe00e0909
Update ec2 provider and profile config files for cloud nightly tests
2014-09-18 20:41:08 -06: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
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
1ccec204b2
Put provider specific information only in provider configuration file
2014-09-16 07:08:18 -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
rallytime
40253cb47b
Update ec2 provider and profile config files for cloud nightly tests
2014-09-08 17:06:45 -06:00
rallytime
1727d04701
Generate random cloud provider names on digital ocean
2014-09-05 15:57:00 -06:00
rallytime
6de2a37ec8
Generate random cloud instance name on rackspace tests
2014-09-05 14:09:42 -06:00
rallytime
f5597010ca
Add GPG key file to integration tests
2014-07-31 10:57:49 -06:00
Seth House
b077b2436e
Add 'auto' eauth backend for tests
2014-07-24 16:08:30 -06:00
C. R. Oldham
9dc3f696ca
Fix two RHEL7 tests
2014-07-24 14:11:03 -07:00
Aditya Kulkarni
a7b52855d3
Make sure multiple git pillar sources work
2014-07-08 10:58:31 -06:00
Mike Place
c3d0b5cba5
Dummy file to fix failing tests.
2014-07-01 15:58:01 -06:00
Thomas S Hatch
50ee9dd5af
Merge pull request #13680 from pass-by-value/file_perms_no_exit
...
File perms no exit
2014-06-30 17:43:54 -06:00
Aditya Kulkarni
3a59cbf9cb
Add regression test for master_tops
2014-06-25 14:53:11 -04:00
rallytime
c001f717a4
Fix digital ocean provider integration tests
2014-06-24 14:33:15 -06:00
Aditya Kulkarni
8ee2e01092
Change from auto to pam
2014-06-24 14:17:54 -04:00
rallytime
276affe259
Initial cloud provider tests for GoGrid
2014-06-12 17:09:57 -06:00
rallytime
dd03b59dc6
Rackspace with openstack driver cloud tests
2014-06-11 11:26:30 -06:00
rallytime
da839f9ec7
salt-cloud tests for digital ocean
2014-06-09 14:49:49 -06:00
rallytime
7689a9bc99
salt-cloud tests for linode
2014-06-09 14:49:49 -06:00
Pedro Algarvio
7bd8b1360f
Remove remaining exsel code
2014-05-29 01:32:54 +01:00
Pedro Algarvio
4d7ca91424
Remove unnecessary ©️ and :license: from file headers
2014-05-26 19:26:15 +01:00
Mike Place
f3733fabf4
Clean up sshd config.
...
Remove hostkeys that are now dymaically generated per-run.
No more usepam
2014-05-23 15:04:11 -06:00
Mike Place
7abc25f67f
Generate server keys too
2014-05-23 14:11:14 -06:00
Mike Place
cf25592c53
Working salt-ssh test runner
...
This rounds out initial (alpha) support for a salt-ssh test runner.
At present, one must manually specify the --ssh flag to ensure that
the ssh deamons are spun up properly.
Conflicts:
tests/integration/__init__.py
tests/integration/files/conf/_ssh/sshd_config
tests/integration/files/conf/sshd_config
tests/integration/files/ext-conf/sshd_config
2014-05-23 14:11:14 -06:00
Elias Probst
f57dce2224
Correct usage of 'CLI Example' in documentation blocks
...
This mass-edit was done using the following shell command:
ack --python -l '^(\s*)CLI Example::$' \
| xargs sed -i \
's/^\(\s*\)CLI Example::/\1CLI Example:\n\n\1.. code-block:: bash/g'
2014-05-14 19:29:49 +02:00
Pedro Algarvio
6b1380a25c
Move sshd_config file to another directory to avoid problems.
2014-05-12 19:06:09 +01:00
Mike Place
d7bba818a9
Only listen on localhost.
2014-05-10 14:18:53 +01:00
Mike Place
0cbac67a3f
Support for continuous integration testing of salt-ssh
2014-05-10 14:18:53 +01:00
Pedro Algarvio
33f361e99d
Don't use the deprecated keyword argument
2014-04-24 09:06:28 +01:00
Thomas S Hatch
9ed1e172e3
Maybe this will fix the ubuntu tests on jenkins!
2014-04-02 11:02:03 -06:00
Thomas S Hatch
d478a16ef5
These tests should have never worked!!
2014-04-02 10:27:04 -06:00
