From ca08dcdfee9ddedf770eab2fe1a1f04a64f7fe6d Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Thu, 29 Nov 2018 16:21:01 -0500 Subject: [PATCH] LAVA2: use new rootfs The new rootfs have all the necessary dependancy baked-in. This save time and reduce complexity overall. Signed-off-by: Jonathan Rajotte --- scripts/system-tests/lava2-submit.py | 9 +-------- scripts/system-tests/template_lava_job.jinja2 | 8 ++++++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py index 2ad6512..d61dfbf 100644 --- a/scripts/system-tests/lava2-submit.py +++ b/scripts/system-tests/lava2-submit.py @@ -50,12 +50,6 @@ class DeviceType(): 'x86' : x86, } -def get_packages(): - return ['bsdtar', 'psmisc', 'wget', 'python3', 'python3-pip', \ - 'libglib2.0-dev', 'libffi-dev', 'elfutils', 'libdw-dev', \ - 'libelf-dev', 'libmount-dev', 'libxml2', 'libpfm4-dev', \ - 'libnuma-dev', 'python3-dev', 'swig', 'stress'] - def get_job_bundle_content(server, job): try: bundle_sha = server.scheduler.job_status(str(job))['bundle_sha1'] @@ -183,7 +177,7 @@ def get_vlttng_cmd(device, lttng_tools_commit, lttng_ust_commit=None): return vlttng_cmd def main(): - nfsrootfs = "https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_trusty_2016-02-23-1134.tar.gz" + nfsrootfs = "https://obj.internal.efficios.com/lava/rootfs/rootfs_amd64_bionic_2018-11-29.tar.gz" test_type = None parser = argparse.ArgumentParser(description='Launch baremetal test using Lava') parser.add_argument('-t', '--type', required=True) @@ -237,7 +231,6 @@ def main(): context['job_name'] = args.jobname context['test_type'] = test_type - context['packages'] = get_packages() context['random_seed'] = random.randint(0, 1000000) context['device_type'] = device_type diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2 index c7ac308..69a62a9 100644 --- a/scripts/system-tests/template_lava_job.jinja2 +++ b/scripts/system-tests/template_lava_job.jinja2 @@ -53,6 +53,11 @@ actions: minutes: 10 method: ipxe commands: nfs + auto_login: + login_prompt: 'login:' + username: root + password_prompt: 'Password:' + password: root prompts: - 'root@linaro-server:~#' @@ -70,8 +75,8 @@ actions: - x86 run: steps: - - cat /etc/resolv.conf - echo nameserver 172.18.0.12 > /etc/resolv.conf + - ip a - groupadd tracing {% if device_type == DeviceType.x86 %} - mount /dev/sda1 /tmp @@ -81,7 +86,6 @@ actions: - locale-gen en_US.UTF-8 - apt-get update - apt-get upgrade - - apt-get install -y {{ packages|join(" ") }} {% if test_type != TestType.kvm_fuzzing_tests %} - pip3 install --upgrade pip - hash -r -- 2.34.1