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

Modify the test_11_environment to work with multiple architectures

tests/integration/assets/test_11/cloud-config_arm.yml

@@ -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

tests/integration/assets/test_11/cloud-config_arm64.yml

@@ -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

tests/integration/rostest/test_11_environment.py

@@ -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