diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-03-07 12:57:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-07 12:57:48 +0000 |
| commit | 77287a7167fd74cd80a97828834134b7b75e65c1 (patch) | |
| tree | 68d74cf66a256bf630b51c8346d0f6e16be48bd4 | |
| parent | ccb79f369e484832deb99b989fada30c6b730697 (diff) | |
| parent | 3d5d2cb57dfa09d5856e5168029f5491d9266ca6 (diff) | |
Merge "Aarch64 adaption in functest for snaps healthcheck"
| -rw-r--r-- | functest/ci/config_aarch64_patch.yaml | 8 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/health_check.py | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml index 9a345e3f7..b43b5a76c 100644 --- a/functest/ci/config_aarch64_patch.yaml +++ b/functest/ci/config_aarch64_patch.yaml @@ -5,10 +5,10 @@ os: image_file_name: cirros-d161201-aarch64-disk.img image_password: gocubsgo - snaps_simple_healthcheck: - disk_image: /home/opnfv/functest/data/cirros-d161201-aarch64-disk.img - kernel_image: /home/opnfv/functest/data/cirros-d161201-aarch64-kernel - ramdisk_image: /home/opnfv/functest/data/cirros-d161201-aarch64-initramfs + snaps_health_check: + disk_url: http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-disk.img + kernel_url: http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-kernel + ramdisk_url: http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-initramfs extra_properties: os_command_line: root=/dev/vdb1 rw rootwait console=tty0 console=ttyS0 console=ttyAMA0 hw_video_model: vga diff --git a/functest/opnfv_tests/openstack/snaps/health_check.py b/functest/opnfv_tests/openstack/snaps/health_check.py index 993c1000c..c19bf39c6 100644 --- a/functest/opnfv_tests/openstack/snaps/health_check.py +++ b/functest/opnfv_tests/openstack/snaps/health_check.py @@ -28,7 +28,12 @@ class HealthCheck(PyTestSuiteRunner): self.case_name = "snaps_health_check" ext_net_name = snaps_utils.get_ext_net_name() + image_custom_config = None + if hasattr(CONST, 'snaps_health_check'): + image_custom_config = CONST.snaps_health_check + self.suite.addTest( OSIntegrationTestCase.parameterize( SimpleHealthCheck, CONST.openstack_creds, ext_net_name, - use_keystone=CONST.snaps_use_keystone)) + use_keystone=CONST.snaps_use_keystone, + image_metadata=image_custom_config)) |