diff --git a/Vagrantfile b/Vagrantfile index 7cee912c2001bebac75daf533dfbe52c7e8cb13f..7184037a859b27841755d3d456dd95ab5832c6b3 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 diff --git a/install_base.sh b/install_base.sh index 9f0bd57164dc3f8c5e53c05f06763d7d8345bf37..dd8087536c5577b7694259dc5803d6e03a16c5b5 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" } diff --git a/lisa/platforms/platinfo.py b/lisa/platforms/platinfo.py index c88e209036e3612b5db93dc9c7379218785e5194..c9c137f94b57d853dfba98cc56ab76a4f2957394 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 75e299292ab63f485d9fee21029d4186a73dc549..df0ceb5233640ca9b9d0b21e39cbe067440ed3de 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