diff options
| author |   Cristina Pauna <cristina.pauna@enea.com> | 2017-02-16 12:22:21 +0200 |
|---|---|---|
| committer | Cristina Pauna <cristina.pauna@enea.com> | 2017-02-27 17:04:04 +0200 |
| commit | adbcb25389612d86d446d5f34787b1b2519c3b83 (patch) | |
| tree | 2835532d04d2fde90819e2e8752e872be5dc1b60 /functest/ci/config_aarch64_patch.yaml | |
| parent | cbcf4f5b8805cc6a052fdf190e1cade2d75c02e0 (diff) | |
Add aarch64 custom config
In order to run functest on an aarch64 POD, some custom configuration
is needed. Up until now that custom configuration was put on the arm
jenkins slave. With this commit it is integrated in functest project.
1. In order to identify if the POD is aarch64 or x86 function
get_arch() from https://gerrit.opnfv.org/gerrit/#/c/29099
is used
2. Changes to config_functest.yaml are made via a new patch file
config_aarch64_patch.yaml which is applied for all scenarios.
Function patch_config_file() is modified to be more generic. It
now receives a file as parameter and merges any type of patch file
3. The aarch64 cirros images are downloaded into the data directory.
Functest can be run from both an aarch64 or a x86 jenkins slave
in order to test an aarch64 POD. So the images are downloded in both
dockerfiles
4. Other custom config needs to be added to /etc/rally/rally.conf
in the docker. The custom config is set in rally_aarch64_patch.conf
and inserted in the needed file before the rally environment is
set up
JIRA: ARMBAND-60
Change-Id: I8e460cdf02d297c259cbbd9c05e7983367fd2bb9
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Diffstat (limited to 'functest/ci/config_aarch64_patch.yaml')
| -rw-r--r-- | functest/ci/config_aarch64_patch.yaml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/functest/ci/config_aarch64_patch.yaml b/functest/ci/config_aarch64_patch.yaml new file mode 100644 index 000000000..9a345e3f7 --- /dev/null +++ b/functest/ci/config_aarch64_patch.yaml @@ -0,0 +1,20 @@ +os: + general: + openstack: + image_name: TestVM + 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 + extra_properties: + os_command_line: root=/dev/vdb1 rw rootwait console=tty0 console=ttyS0 console=ttyAMA0 + hw_video_model: vga + + vping: + image_name: TestVM + + doctor: + image_name: TestVM |