rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-19 00:59:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #892 from datawolf/fix-test-to-work-with-multi-arch

Browse Source 
Modify the test_11_environment to work with multiple architectures
This commit is contained in:
Darren Shepherd
2016-05-02 13:25:06 -07:00
parent cd84bd8cf6 4439cdde41
commit a888a57cd9
3 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/integration/rostest/test_11_environment.py
View File

@@ -3,12 +3,14 @@ import rostest.util as u
from rostest.util import SSH
ssh_command = ['./scripts/ssh', '--qemu', '--key', './tests/integration/assets/test.key']
cloud_config_path = './tests/integration/assets/test_11/cloud-config.yml'
cloud_config_path = {'amd64': './tests/integration/assets/test_11/cloud-config.yml',
'arm': './tests/integration/assets/test_11/cloud-config_arm.yml',
'arm64': './tests/integration/assets/test_11/cloud-config_arm64.yml'}
@pytest.fixture(scope="module")
def qemu(request):
q = u.run_qemu(request, ['--cloud-config', cloud_config_path])
q = u.run_qemu(request, ['--cloud-config', cloud_config_path[u.arch]])
u.flush_out(q.stdout)
return q