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

Merge pull request #26619 from rallytime/cloud-test-fixes

Browse Source 
Apply cloud test fixes from 2015.5 to 2015.8
This commit is contained in:
Nicole Thomas 2015-08-24 15:49:33 -06:00
commit 2964700609
8 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/cloud/providers/digital_ocean.py
View File

@ -87,7 +87,7 @@ class DigitalOceanTest(integration.ShellCase):
image_list = self.run_cloud('--list-images {0}'.format(PROVIDER_NAME))
self.assertIn(
'14.10 x64',
'14.04 x64',
[i.strip() for i in image_list]
)

1
tests/integration/files/conf/cloud.profiles.d/azure.conf
View File

@ -7,3 +7,4 @@ azure-test:
ssh_username: ''
ssh_password: ''
media_link: ''
script_args: '-P'

1
tests/integration/files/conf/cloud.profiles.d/digital_ocean.conf
View File

@ -2,3 +2,4 @@ digitalocean-test:
provider: digitalocean-config
image: 14.04 x64
size: 2GB
scipt_args: '-P'

1
tests/integration/files/conf/cloud.profiles.d/ec2.conf
View File

@ -3,3 +3,4 @@ ec2-test:
image: ami-98aa1cf0
size: t1.micro
sh_username: ec2-user
script_args: '-P'

1
tests/integration/files/conf/cloud.profiles.d/gogrid.conf
View File

@ -2,3 +2,4 @@ gogrid-test:
provider: gogrid-config
size: 512MB
image: Ubuntu 14.04 LTS Server (64-bit) w/ None
script_args: '-P'

1
tests/integration/files/conf/cloud.profiles.d/joyent.conf
View File

@ -3,3 +3,4 @@ joyent-test:
size: Extra Small 512 MB
image: ubuntu-certified-14.04
location: us-east-1
script_args: '-P'

1
tests/integration/files/conf/cloud.profiles.d/linode.conf
View File

@ -2,3 +2,4 @@ linode-test:
provider: linode-config
size: Linode 2048
image: Ubuntu 14.04 LTS
script_args: '-P'

1
tests/integration/files/conf/cloud.profiles.d/rackspace.conf
View File

@ -2,3 +2,4 @@ rackspace-test:
provider: rackspace-config
size: 2 GB Performance
image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
script_args: '-P'