From adbcb25389612d86d446d5f34787b1b2519c3b83 Mon Sep 17 00:00:00 2001 From: Cristina Pauna Date: Thu, 16 Feb 2017 12:22:21 +0200 Subject: 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 --- docker/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 1187fb95..de47e157 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -123,9 +123,7 @@ RUN find ${FUNCTEST_REPO_DIR} -name "*.py" \ RUN /bin/bash ${REPOS_DIR}/parser/tests/parser_install.sh ${REPOS_DIR} RUN ${REPOS_DIR}/rally/install_rally.sh --yes -ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img ${FUNCTEST_BASE_DIR}/data/ -ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-lxc.tar.gz ${FUNCTEST_BASE_DIR}/data/ -ADD http://205.177.226.237:9999/onosfw/firewall_block_image.img ${FUNCTEST_BASE_DIR}/data/ +RUN /bin/bash ${REPOS_DIR}/functest/docker/add_images.sh RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 RUN curl -L https://get.rvm.io | bash -s stable -- cgit 1.2.3-korg