summaryrefslogtreecommitdiffstats
path: root/tools/yardstick-img-modify
AgeCommit message (Collapse)AuthorFilesLines
2017-03-22Bugfix: remove vivid as it is EOLRoss Brattain1-29/+0
Vivid is end of life, and thus not supported. Change-Id: Ia293fcd6fd2a3279a642a6dbbb7ad1811334c3e1 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> (cherry picked from commit 14172bb39e8e30f37ec5bb80be6b187ab6858e88)
2017-03-22aarch64: Fix missing qemu-aarch64-static in chrootPaul Vaduva1-3/+3
During recent rework, we lost the explicit copy of qemu-aarch64-static from docker to chroot; so when trying to execute AArch64 binaries inside chroot, no emulator was present to handle it. This change brings back (inside chroot) the missing emulator binary. JIRA: YARDSTICK-595 Change-Id: I146e2eeec2e9452a0db36f0bf0a466a8affc2005 Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com> (cherry picked from commit 742ee6f3249a6204a351fe02c1334c9b14213e51)
2017-03-21Bugfix: replace MD5SUM with SHA256SUMsRoss Brattain1-6/+6
MD5 is broken and should not be used Change-Id: Ib168932387f58f0a538d865f8ef4e3cda046a35a Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> (cherry picked from commit fe655f15b0838b41c8c91543898ceebf23f1494c)
2017-03-17Bugfix: yardstick-image built without test toolsJingLu51-6/+2
JIRA: YARDSTICK-593 The yardstick-image now built dosen't have test tools in it. This patch aims to fix this issus. Change-Id: I9863a933106236835c16e21f84aa107ffd554df7 Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit bd90c394fe223c5d465d70fb24076ef1d9258c91)
2017-03-03Add uefi image support for yardstickCatalina Focsa1-27/+40
Add support for downloading and building an uefi single part image. Keep three part image support if needed. Keep modifications required for arm64, when using vivid. Install and use parted required for GPT partitioning. Change-Id: I1a9a20701e2fe1f6f644f2c687c5da2e09b69d89 Signed-off-by: Catalina Focsa <catalina.focsa@enea.com>
2016-12-21restore the yardstick-img-modify cleanup() funcRyan.RCS1-3/+5
There is a result failed again after last update. So i restore the clean() function to its original codes and avoid CI failed. But i'm not sure something about the clean() function, and I will check this failed clearly in future. Change-Id: I8f49533788c7ccb2016e7a484368a72028579fa8 JIRA: YARDSTICK-502 Signed-off-by: Ryan.RCS <lihainong@huawei.com>
2016-12-21fixed issue in yardstick-img-modify cleanup() funRyan.RCS1-1/+5
1. when run yardstick-img-modify script, sometimes it show below error. + '[' -f /tmp/workspace/yardstick/yardstick-xenial-server.raw ']' + kpartx -dv /tmp/workspace/yardstick/yardstick-xenial-server.raw ioctl: LOOP_CLR_FD: No such device or address del devmap : loop0p1 can't del loop : /dev/loop0 + test 1 -eq 1 -o 1 -eq 2 2. so i added a expression to check if the .raw file map deleted or not 3. if the devmap not deleted, then we delete it, otherwise, we do nothing JIRA: YARDSTICK-502 Change-Id: Ia050121ed6bf837bab05e38f2e9e9628ca31627a Signed-off-by: Ryan.RCS <lihainong@huawei.com>
2016-12-15Bugfixed:run command: "yardstick-img-modify" fail!Ryan.RCS1-1/+1
Avoid incorrect deletion of $raw_imgfile when the command: "kpartx -dv $raw_imgfile" execute failed. JIRA: YARDSTICK-424 Change-Id: I34dac60bda6c028c4b0f0bfd9ad077e2d5dbb0ff Signed-off-by: Ryan.RCS <lihainong@huawei.com>
2016-11-09Upgrade yardstick VM image from Ubuntu 14.04 to 16.04JingLu51-3/+4
JIRA: YARDSTICK-365 This patch upgrades the base Ubuntu version of Yardstick VM image from trusty(14.04) to xenial(16.04). If you still want to use Ubuntu 14.04 to build Yardstick custom image you can use command: sudo ./tools/yardstick-img-modify tools/ubuntu-server-cloudimg-modify.sh trusty And now the "yardstick-trusty-server" is rename as "yardstick-image". Change-Id: I0765f3aee2d17eea1ad2257d0f576cdb9ef2b18d Signed-off-by: JingLu5 <lvjing5@huawei.com>
2016-09-10yardstick: modify e2fsck command to run with -p paramPaul Vaduva1-1/+1
e2fsck command will not run without human intervention if we do not use -p option. Jira issue: ARMBAND-74 Change-Id: Ie7f9b526a568e49ad44c4ee3b4fe75a1065bb1b3 Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
2016-08-31ARM64: Add support for aarch64 architecturePaul Vaduva1-8/+39
Added support for arm64 architecture so that yardstick framework can be ran on arm-pod1 the armband CI pod. The modifications include testing for presence of arm64 architecture nodes in the pod and running arm64 specific code (building yardstick server image on arm64 version of ubuntu cloud. Openstack doesn't boot 3.13 kernel(arm64) so it was replaced with 3.19 kernel(also arm64), available for vivid cloud image of ubuntu. The Dockerfile for building the ci image was also mofied to add necessary tools for cross-building an arm64 image on amd64 host (the jumpserver) The jira case for this commit is ARMBAND-40. Change-Id: I906d4adbcf2ec2c0f1d695d9916ede42f4151080 Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
2016-02-12Add more debug to image buildJo¶rgen Karlsson1-1/+5
Change-Id: Icfbed0433cb9cfb6f8f479fc69699d08ad49602b Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
2016-02-08yardstick image build cleanupsJo¶rgen Karlsson1-3/+6
- reduce progress verbosity when downloading with wget - added some debug printouts for trouble shooting mount issues Change-Id: Ic608f847b0fe74df231ce3d7d419dcf6c19807ed Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
2016-01-29Add debug info to solve image build errorsJo¶rgen Karlsson1-1/+5
Add more debug output and clear devmap table in order to solve build problems in YARDSTICK-226. Change-Id: Idfdbb925501c8debb67406f2dd316e1d4bfbaaa8 JIRA: YARDSTICK-226 Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
2015-11-10Add cleanup trap to yardstick-img-modifyJo¶rgen Karlsson1-1/+23
Fixes a problem with loopback devices not beeing detached when the image build fails. Change-Id: I3e422be4fb0157289a032c14700e184f58d544d9 Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
2015-10-16Fix for netperf install in glance imageJo¶rgen Karlsson1-0/+11
Fixes two issues in the chrooted environment: - /proc must be mounted when installing certain packages. - prevent services from starting when installing or updating packages. JIRA :- Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com> Change-Id: Ia7180c190bf93c173ea93207ed323ca96662c029
2015-10-14Docker container for Yardstick CIJo¶rgen Karlsson1-18/+22
The Docker container is intended to be run by the CI pipeline but it may also be used stand alone. Building the docker image: $ cd yardstick/ci/docker $ make clean && make Pushing image to docker hub: $ docker login ... (credentials needed) $ docker push opnfv/yardstick-ci (need to connect your account to opnfv) The docker image must be manually built and pushed to the docker Hub. This will probably be handled by gerrit triggers in the future (including revision handling and tagging of images). Example invocation: docker run \ --privileged=true \ -t \ -e "INSTALLER_TYPE=fuel" \ -e "INSTALLER_IP=10.20.0.2" \ -e YARDSTICK_BRANCH="refs/changes/01/2201/7" \ -e RELENG_BRANCH="master" \ opnfv/yardstick-ci \ run_benchmarks Basic steps performed by the container: 1. clone yardstick and releng repos 2 setup OS credentials (releng scripts) 3. install yardstick and dependencies 4. build yardstick cloud image and upload it to glance 5. upload cirros-0.3.3 cloud image to glance 6. run yardstick test scenarios If anything goes wrong in any of the steps above a non-zero exit status is returned. Some limitations: Scenario results (yardstick.out) are currently discarded. A future patch will take care of dumping the result to a database. Currently the container only runs the ping sample scenario. Testsuite execution (and selection) will be added in a future patch. The container has only been tested against fuel installations. Change-Id: I0bd29035082d3e283429c7392de8fc11b9fd777f JIRA: YARDSTICK-136 Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
2015-09-09Add support for building images on CentOSJo¶rgen Karlsson1-7/+14
This is a workaround for building on CentOS. CentOS don't have nbd so guestfstool is used to mount the ubuntu image. The http sources has been changed to ftp as the apt-get tool inside the Ubuntu image dont work well with http sources when running on CentOS. Change-Id: I23679ff034ea76782dcc73d3283cb70ebace5ee8 JIRA: YARDSTICK-136 Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
2015-06-15Add support for building imagesHans Feldt1-0/+111
Two scripts are added. One that will be installed in user's PATH and one that is an example of how to modify an image from within. See README for example and script for more info Change-Id: Iab743f6e9105d5ba872ffba0512ffee954c6d830 JIRA: YARDSTICK-28 Signed-off-by: Hans Feldt <hans.feldt@ericsson.com>