diff options
| author |   Cristina Pauna <cristina.pauna@enea.com> | 2017-03-02 14:54:26 +0000 |
|---|---|---|
| committer | Cristina Pauna <cristina.pauna@enea.com> | 2017-03-06 19:43:05 +0200 |
| commit | 3d5d2cb57dfa09d5856e5168029f5491d9266ca6 (patch) | |
| tree | 4c42a1e78453870cb06a0914cb47fb598cdad9a6 | |
| parent | efb92b98e18b1d1be2254e2ba1bde8060f131006 (diff) | |
Aarch64 adaption in functest for snaps healthcheck
This commit is half of the fix for adapting the snaps healthcheck
to run on an aarch64 POD. The fix consists in reading the custom
parameters and passing them to the snaps test
The snaps part that uses this info is
https://gerrit.opnfv.org/gerrit/29853
JIRA: ARMBAND-222
Change-Id: I2027f2ef3afe0caddef781771f2190fc173aff8c
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
| -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)) |