rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-20 18:13:35 +00:00
Code Issues Releases Wiki Activity

Modify the test_11_environment to work with multiple architectures

Browse Source 
Signed-off-by: Wang Long <long.wanglong@huawei.com>
This commit is contained in:
Wang Long
2016-04-19 11:30:30 +08:00
parent eeea325e54
commit 4439cdde41
3 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/integration/assets/test_11/cloud-config_arm.yml Normal file
View File

@@ -0,0 +1,18 @@
#cloud-config
rancher:
environment:
A: A
BB: BB
BC: BC
services:
env:
image: armhf/busybox
command: env
labels:
io.rancher.os.scope: system
io.rancher.os.before: console
environment:
- A
- B*
ssh_authorized_keys:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUlsWAL5Rf0Wis/A7k7Tlqx0fZS60VzCZrPZYbP/wkL95jv0XzCx8bd1rZHeybblHPDNpND3BLv4qPY5DxRyexF4seGuzcJI/pOvGUGjQondeMPgDTFEo5w939gSdeTZcfXzQ0wAVhzwDbgH4zPfMzbdoo8Aiu9jkKljXw8IFju0gh+t6iKkGZCIjKT9o7zza1vGfkodhvi2V3VzPdNO28gaxZaRNtmBYUoVnGyR6nXN1Q3CJaVuh5o6GPCOqrhHNbYOFZKBpDiHbxPhVpxHQD2+8yUSGTG7WW75FfZePja5y8d0c/O5L37ZYx4AZAd3KgQYDBT2XCEJGQNawNbfpt

18
tests/integration/assets/test_11/cloud-config_arm64.yml Normal file
View File

@@ -0,0 +1,18 @@
#cloud-config
rancher:
environment:
A: A
BB: BB
BC: BC
services:
env:
image: aarch64/busybox
command: env
labels:
io.rancher.os.scope: system
io.rancher.os.before: console
environment:
- A
- B*
ssh_authorized_keys:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUlsWAL5Rf0Wis/A7k7Tlqx0fZS60VzCZrPZYbP/wkL95jv0XzCx8bd1rZHeybblHPDNpND3BLv4qPY5DxRyexF4seGuzcJI/pOvGUGjQondeMPgDTFEo5w939gSdeTZcfXzQ0wAVhzwDbgH4zPfMzbdoo8Aiu9jkKljXw8IFju0gh+t6iKkGZCIjKT9o7zza1vGfkodhvi2V3VzPdNO28gaxZaRNtmBYUoVnGyR6nXN1Q3CJaVuh5o6GPCOqrhHNbYOFZKBpDiHbxPhVpxHQD2+8yUSGTG7WW75FfZePja5y8d0c/O5L37ZYx4AZAd3KgQYDBT2XCEJGQNawNbfpt

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

@@ -3,12 +3,14 @@ import rostest.util as u
from rostest.util import SSH from rostest.util import SSH
ssh_command = ['./scripts/ssh', '--qemu', '--key', './tests/integration/assets/test.key'] 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") @pytest.fixture(scope="module")
def qemu(request): 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) u.flush_out(q.stdout)
return q return q