Commit Graph

108 Commits

Author SHA1 Message Date
rallytime
e14931ff2d Also add -Z to script args for cloud tests 2015-08-24 16:11:01 -06:00
rallytime
0d6eebf3c3 Extra lines 2015-08-24 15:12:31 -06:00
rallytime
c69c918b46 Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests 2015-08-24 15:12:25 -06:00
rallytime
b68e3c0d0c Update the Azure Cloud Provider tests to be more acurate and use newer azure SDK version 2015-06-25 15:14:21 -06:00
rallytime
7ed776c293 Cloud tests should use an image that is LTS
Changes the test image to create for digital ocean cloud tests to be on Ubuntu 14.04, not 14.10
2015-05-18 14:04:24 -06:00
rallytime
7e15ff94ff Move digital_ocean_v2 tests to be the defauly/only tests for digital ocean cloud tests 2015-05-14 15:25:00 -06:00
Thayne Harbaugh
6f4cfd01fc Specify compound matches as lists
Compound matches, such as nodegroups, can now be specified as lists.  This
avoids splitting on whitespace which may be part of a key or value.

Right now this only works for nodegroups.  Making the argument to "-C"
(compound list) a JSON argument is a future task.
2015-04-24 17:00:04 -06:00
Colton Myers
ef583295d5 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/beacons/service.py
2015-04-20 11:41:25 -06:00
Thayne Harbaugh
b37b6b2849 Add a test for incorrectly-nested nodegroups that cause a resolution loop. 2015-04-17 17:01:47 -06:00
Thayne Harbaugh
6c1d4d58e9 Fix failure with nested nodegroups:
If a nodegroup was re-used - even if it wasn't a circular reference - it
would fail the nodegroup expansion with the following message:

    Failed nodegroup expansion: illegal nested nodegroup "min"

This was simply because already-visited nodegroups are pushed into `skip`
but were never popped.

   * Add another test case for this situation.
   * Pop the current nodegroup from `skip` when leaving the expansion
     context

Fixes: #22797
2015-04-17 15:20:34 -06:00
Tomas Sirny
42d26cc699 Shorter disk resource definition 2015-04-17 16:30:06 +02:00
Tomas Sirny
5d93b7619d Working test for extended profile 2015-04-17 15:40:08 +02:00
Tomas Sirny
6f34f0db74 Allow setting multiple disks and scopes on create of instance for GCE 2015-04-17 15:40:08 +02:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Damian Myerscough
c6e618bc5f Digital Ocean APIv2 Integration Testing 2015-04-10 21:30:09 -07:00
Thayne Harbaugh
1c3536fb8e Support nested nodegroups
Nodegroups can be recursively expanded without worrying about other
compound matcher expansions.  Once the nodegroups are expanded on the
master the remaining flattened compound match can be expanded without the
nodegroup information.
2015-04-08 23:16:39 -06:00
Mike Place
018400d94c Remove loop interval setting, was causing cpus to spin 2015-04-03 15:34:47 -06:00
Colton Myers
70406867a4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/client/__init__.py
    salt/modules/file.py
    salt/modules/yumpkg.py
    salt/modules/zypper.py
    tests/integration/shell/auth.py
    tests/unit/states/archive_test.py
    tests/unit/states/module_test.py
2015-03-20 20:09:19 -06:00
Colton Myers
2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/topology/syndic.rst
    salt/client/__init__.py
    salt/daemons/masterapi.py
    salt/minion.py
    salt/modules/dockerio.py
2015-03-19 16:03:29 -06:00
Justin Findlay
f735f0b96d add eauth pam group tests
Adds test for #17380.
2015-03-17 14:25:57 -06:00
Mike Place
d04062a5ad Remove loop interval setting, was causing cpus to spin 2015-03-13 16:00:32 -06:00
Tomas Sirny
494d7069fd Working basic test for GCE cloud provider 2015-03-08 23:16:36 +01:00
Tomas Sirny
ee00477bae Template configs for GCE cloud provider 2015-03-08 16:44:14 +01:00
rallytime
b51492486f Add Joyent cloud provider tests 2015-02-20 17:25:07 -07:00
rallytime
dc23823897 Merge branch '2014.7' into '2015.2'
Conflicts:
	salt/modules/localemod.py
2015-01-27 13:24:14 -07:00
rallytime
299374a211 Change image name in rackspace profile config to a valid one 2015-01-24 20:14:23 -07:00
Colton Myers
70489c62a7 Merge branch '2014.7' into merge-forward-2015.2
Conflicts:
	salt/modules/cron.py
	salt/modules/rabbitmq.py
	salt/modules/smf.py
	salt/modules/upstart.py
	salt/modules/useradd.py
	salt/modules/zpool.py
	salt/pillar/git_pillar.py
2015-01-07 14:49:58 -07:00
Seth House
e96654744f Added test for git_pillar branch to env mappings 2015-01-06 16:51:58 -07:00
Colton Myers
716a7e3331 Merge branch '2014.7' into merge-forward
Conflicts:
	salt/modules/bsd_shadow.py
	salt/modules/freebsdjail.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
	salt/modules/zypper.py
	salt/netapi/rest_tornado/saltnado.py
	salt/states/dockerio.py
2014-11-18 12:46:29 -07:00
Thomas Jackson
f0f9b14ee2 Add tests for MinionSaltAPIHandler 2014-11-13 08:36:27 -08:00
Pedro Algarvio
4235d15184 Merge branch '2014.7' into develop 2014-11-07 21:47:49 +00:00
Pedro Algarvio
b425c20919 2 of 500000
Let's not hardcode the SSH tests to the root user without the need for
that.
2014-11-06 19:42:59 +00:00
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
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
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