From 459f6b0055c5db6fc2fec39b96fdec592f92ccba Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 31 May 2019 09:25:50 +0000 Subject: [PATCH] Add meltdown spectre to calibration set + Fix the version of MMD tool to always latest Change-Id: Iafd7f40d618b8e4995b5cc12fe06056719f58517 Signed-off-by: Peter Mikus --- resources/libraries/bash/entry/bootstrap_verify_perf.sh | 2 +- resources/libraries/bash/function/ansible.sh | 2 +- .../testbed-setup/ansible/roles/calibration/tasks/main.yaml | 5 +---- .../ansible/roles/calibration/tasks/ubuntu_bionic.yaml | 9 --------- 4 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu_bionic.yaml diff --git a/resources/libraries/bash/entry/bootstrap_verify_perf.sh b/resources/libraries/bash/entry/bootstrap_verify_perf.sh index c0479a742c..84e2c3211d 100644 --- a/resources/libraries/bash/entry/bootstrap_verify_perf.sh +++ b/resources/libraries/bash/entry/bootstrap_verify_perf.sh @@ -42,7 +42,7 @@ activate_virtualenv || die generate_tests || die archive_tests || die reserve_testbed || die -ansible_hosts "run-jitter-tool" || die +ansible_hosts "calibration" || die select_tags || die compose_pybot_arguments || die run_pybot || die diff --git a/resources/libraries/bash/function/ansible.sh b/resources/libraries/bash/function/ansible.sh index a9314b4cd2..663861e8d8 100644 --- a/resources/libraries/bash/function/ansible.sh +++ b/resources/libraries/bash/function/ansible.sh @@ -40,7 +40,7 @@ function ansible_hosts () { die "Failed to read hosts from working topology!" } pushd "${TOOLS_DIR}"/testbed-setup/ansible || die "Pushd failed!" - ansible-playbook \ + ANSIBLE_STDOUT_CALLBACK=yaml ansible-playbook \ --vault-password-file=vault_pass \ --extra-vars '@vault.yml' \ --inventory inventories/lf_inventory/hosts site.yaml \ 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 ba9c46634f..34c987bdcb 100644 --- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml @@ -1,11 +1,8 @@ --- # file: roles/calibration/tasks/main.yaml -- 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' + raw: 'wget -qO - https://meltdown.ovh | sudo bash -s - --no-color || true' register: spectre_meltdown_output tags: run-spectre-meltdown-checker 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 deleted file mode 100644 index ef453cdf9a..0000000000 --- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu_bionic.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -# 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 -- 2.16.6