From 648b88dded49db91bbdecf93fbc684e8c696752d Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Sat, 16 Mar 2019 07:41:07 +0000 Subject: FIX: Ansible warnings of deprecation [DEPRECATION WARNING]: Invoking "apt" only once while using a loop via squash_actions is deprecated. + aenum pip fix version + crypto dependencies Change-Id: I7ca4de48d68ec4d8a8f57fedf204fa6710a3e75f Signed-off-by: Peter Mikus --- .../testbed-setup/ansible/roles/calibration/tasks/main.yaml | 5 ++--- .../testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml | 9 --------- .../ansible/roles/calibration/tasks/ubuntu_bionic.yaml | 9 +++++++++ 3 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml create mode 100644 resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu_bionic.yaml (limited to 'resources/tools/testbed-setup/ansible/roles/calibration') diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml index 17be80064a..ba9c46634f 100644 --- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml @@ -1,9 +1,8 @@ --- # file: roles/calibration/tasks/main.yaml -- name: Ubuntu specific - import_tasks: ubuntu.yaml - when: ansible_distribution|lower == 'ubuntu' +- name: Install distribution - release - machine prerequisites + include_tasks: '{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml' - name: Run Spectre Meltdown checker raw: 'spectre-meltdown-checker --no-color' diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml deleted file mode 100644 index bb4ad1e8c7..0000000000 --- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# file: roles/calibration/tasks/ubuntu.yaml - -- name: Install calibration dependencies - apt: - name: 'spectre-meltdown-checker' - state: 'present' - install_recommends: False - tags: install-csit-dependencies diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu_bionic.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu_bionic.yaml new file mode 100644 index 0000000000..ef453cdf9a --- /dev/null +++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu_bionic.yaml @@ -0,0 +1,9 @@ +--- +# file: roles/calibration/tasks/ubuntu_bionic.yaml + +- name: Install calibration dependencies + apt: + name: 'spectre-meltdown-checker' + state: 'present' + install_recommends: False + tags: install-csit-dependencies -- cgit 1.2.3-korg