From 7b93e96740997dab4383140a639b055e074f63c1 Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 15 Feb 2021 16:16:31 +0000 Subject: Infra: Ansible Ubuntu Focal Signed-off-by: pmikus Change-Id: I6558938fe4bbdfb5add7a361adb4a12da6b0a6dc --- .../ansible/roles/calibration/defaults/main.yaml | 32 +++++++++++++++------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'resources/tools/testbed-setup/ansible/roles/calibration') diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml index e5ef3c1bc1..5eb945328c 100644 --- a/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml @@ -2,15 +2,19 @@ # file: roles/calibration/defaults/main.yaml # Packages to install. -packages: "{{ packages_base + packages_by_distro[ansible_distribution | lower] + packages_by_arch[ansible_machine] }}" +packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower][ansible_distribution_release] + packages_by_arch[ansible_machine] }}" packages_base: - [] packages_by_distro: ubuntu: - - "build-essential" - - "dmidecode" + bionic: + - "build-essential" + - "dmidecode" + focal: + - "build-essential" + - "dmidecode" packages_by_arch: aarch64: @@ -19,16 +23,24 @@ packages_by_arch: - [] # Kernel version to check. -kernel_version: "{{ kernel_version_by_distro_by_arch[ansible_distribution | lower][ansible_machine] }}" +kernel_version: "{{ kernel_version_by_distro_by_arch[ansible_distribution | lower][ansible_distribution_release][ansible_machine] }}" kernel_version_by_distro_by_arch: ubuntu: - x86_64: - - "4.15.0-72-generic" - - "5.3.0-1020-azure" - - "4.15.0-1057-aws" - aarch64: - - "4.15.0-54-generic" + bionic: + x86_64: + - "4.15.0-72-generic" + - "5.3.0-1020-azure" + - "4.15.0-1057-aws" + aarch64: + - "4.15.0-54-generic" + focal: + x86_64: + - "5.4.0-65-generic" + - "5.3.0-1020-azure" + - "5.3.0-1017-aws" + aarch64: + - "5.4.0-65-generic" pma_directory: "/tmp/pma_tools" jitter_core: 7 -- cgit 1.2.3-korg