From 08d907b8b7a699a911cf9fbd21cee7f709704501 Mon Sep 17 00:00:00 2001 From: Douglas Raillard Date: Wed, 5 Apr 2023 12:23:23 +0100 Subject: [PATCH 1/3] install_base.sh: Update android SDK version --- install_base.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/install_base.sh b/install_base.sh index 9f0bd5716..dd8087536 100755 --- a/install_base.sh +++ b/install_base.sh @@ -65,7 +65,8 @@ install_android_sdk_manager() { # URL taken from "Command line tools only": https://developer.android.com/studio # Used to be "https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip" - local url="https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip" + # Used to be "https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip" + local url="https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip" local archive="$ANDROID_HOME/android-sdk-manager.zip" rm "$archive" &>/dev/null @@ -108,9 +109,7 @@ call_android_sdkmanager() { install_android_tools() { # We could use install_android_platform_tools here for platform-tools if the # SDK starts being annoying - # Note: recent sdkmanager seem to be installing "platform-tools" by default, - # so it's not necessary anymore to specify it on the command line - yes | call_android_sdkmanager --verbose --channel=0 --install "build-tools;32.0.0" + yes | call_android_sdkmanager --verbose --channel=0 --install "build-tools;33.0.2" yes | call_android_sdkmanager --verbose --channel=0 --install "platform-tools" } -- GitLab From e9494751c672cf26a35f21bc7f085ed6d27f4820 Mon Sep 17 00:00:00 2001 From: Douglas Raillard Date: Wed, 5 Apr 2023 12:27:42 +0100 Subject: [PATCH 2/3] Vagrantfile: Update to Ubuntu 22.10 Kinetic Kudu Upgrade from Ubuntu 20.04 to 22.10. Ubuntu 22.04 LTS Jammy Jellyfish is skipped since it was failing to connect via ssh when provisionning the VM. --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 7cee912c2..7184037a8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -3,7 +3,7 @@ Vagrant.configure(2) do |config| - config.vm.box = "ubuntu/focal64" + config.vm.box = "ubuntu/kinetic64" # Allow using tools like kernelshark config.ssh.forward_x11 = true -- GitLab From b45996a1c1a7cfecd6fe74b0e754e3a767041041 Mon Sep 17 00:00:00 2001 From: Douglas Raillard Date: Thu, 13 Apr 2023 18:22:37 +0100 Subject: [PATCH 3/3] lisa.platforms.platinfo: Handle better unknown cpu-capacities/writeable FIX In case writeability of CPU capacities cannot be detected, assume it is not writeable. This at least allows the self tests to work on x86_64. --- lisa/platforms/platinfo.py | 2 +- lisa/wlgen/rta.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisa/platforms/platinfo.py b/lisa/platforms/platinfo.py index c88e20903..c9c137f94 100644 --- a/lisa/platforms/platinfo.py +++ b/lisa/platforms/platinfo.py @@ -51,7 +51,7 @@ def compute_rtapp_capacities(conf): will be used, otherwise the capacities adjusted with rtapp calibration will be used. """ - writeable = conf['writeable'] + writeable = conf.get('writeable') orig_capacities = conf['orig'] rtapp_calib = conf['..']['rtapp']['calib'] diff --git a/lisa/wlgen/rta.py b/lisa/wlgen/rta.py index 75e299292..df0ceb523 100644 --- a/lisa/wlgen/rta.py +++ b/lisa/wlgen/rta.py @@ -774,7 +774,7 @@ class RTA(Workload): def _setup(self): logger = self.logger plat_info = self.target.plat_info - writeable_capacities = plat_info['cpu-capacities']['writeable'] + writeable_capacities = plat_info['cpu-capacities'].get('writeable') update_cpu_capacities = self.update_cpu_capacities target = self.target -- GitLab