aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-02-26 10:24:41 +0000
committerPeter Mikus <pmikus@cisco.com>2019-02-27 19:18:43 +0000
commit2045a26e54b45a5fd7635102ceda1662d84a2047 (patch)
tree7ca5a76399a569a3b5093f394615633a31385719 /resources/tools
parent97063f15d83378f8c5989b7116eb7a542147455f (diff)
CSIT-1449 Ansible: Adding calibration support
- Remove obsolete bootstrap_setup.sh. - Add calibration support into ansible. - Inject Ansible run with calibration to every job. Change-Id: Ib2d6cd0c04d3bce700b205bef34c3c88edb26e28 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/tools')
-rw-r--r--resources/tools/testbed-setup/README.rst6
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml6
-rw-r--r--resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml33
-rw-r--r--resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml9
-rw-r--r--resources/tools/testbed-setup/ansible/sut.yaml11
-rw-r--r--resources/tools/testbed-setup/ansible/tg.yaml11
-rw-r--r--resources/tools/testbed-setup/ansible/vpp_device.yaml6
7 files changed, 68 insertions, 14 deletions
diff --git a/resources/tools/testbed-setup/README.rst b/resources/tools/testbed-setup/README.rst
index 14871d1d29..01be10b5d3 100644
--- a/resources/tools/testbed-setup/README.rst
+++ b/resources/tools/testbed-setup/README.rst
@@ -98,12 +98,6 @@ Set CIMC/IPMI address, username, password and hostname an BIOS.
Bootstrap the host
``````````````````
-Convenient way to re-stage host via script:
-
-.. code-block:: bash
-
- sudo ./bootstrap_setup_testbed.sh <linux_ip> <mgmt_ip> <username> <pass>
-
Optional: CIMC - From PXE boostrap server
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
index 4d96a39496..452a12c6fc 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
@@ -40,3 +40,9 @@ kubernetes_channel: 'main'
kubernetes_version: '1.11.0-00'
kubernetes_repository: 'deb http://apt.kubernetes.io/ kubernetes-xenial {{ kubernetes_channel }}'
kubernetes_apt_package_name: '{{ kubernetes_version }}'
+
+# Calibration settings.
+jitter:
+ directory: '/tmp/pma_tools'
+ core: 7
+ iterations: 30
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
new file mode 100644
index 0000000000..b70694ad31
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
@@ -0,0 +1,33 @@
+---
+# file: roles/calibration/tasks/main.yaml
+
+- name: Ubuntu specific
+ import_tasks: ubuntu.yaml
+ when: ansible_distribution|lower == 'ubuntu'
+
+- name: Run Spectre Meltdown checker
+ raw: 'spectre-meltdown-checker --no-color'
+ register: spectre_meltdown_output
+ tags: run-spectre-meltdown-checker
+
+- debug: var=spectre_meltdown_output.stdout_lines
+ tags: run-spectre-meltdown-checker
+
+- name: Clone Jitter tool
+ git:
+ repo: 'https://gerrit.fd.io/r/pma_tools'
+ dest: '{{ jitter.directory }}'
+ tags: run-jitter-tool
+
+- name: Compile Jitter tool
+ raw: 'cd {{ jitter.directory }}/jitter && make'
+ tags: run-jitter-tool
+
+- name: Run Jitter tool
+ raw: '{{ jitter.directory }}/jitter/jitter -c {{ jitter.core }} -i {{ jitter.iterations }} -f'
+ become: yes
+ register: jitter_output
+ tags: run-jitter-tool
+
+- debug: var=jitter_output.stdout_lines
+ tags: run-jitter-tool
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml
new file mode 100644
index 0000000000..bb4ad1e8c7
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/ubuntu.yaml
@@ -0,0 +1,9 @@
+---
+# 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/sut.yaml b/resources/tools/testbed-setup/ansible/sut.yaml
index 1f9a4cbaab..9b7a66656d 100644
--- a/resources/tools/testbed-setup/ansible/sut.yaml
+++ b/resources/tools/testbed-setup/ansible/sut.yaml
@@ -6,6 +6,11 @@
become: yes
become_user: root
roles:
- - common
- - sut
- - tg_sut
+ - role: common
+ tags: common
+ - role: tg
+ tags: tg
+ - role: tg_sut
+ tags: tg_sut
+ - role: calibration
+ tags: calibration
diff --git a/resources/tools/testbed-setup/ansible/tg.yaml b/resources/tools/testbed-setup/ansible/tg.yaml
index a652dc5c80..16d2e0fd40 100644
--- a/resources/tools/testbed-setup/ansible/tg.yaml
+++ b/resources/tools/testbed-setup/ansible/tg.yaml
@@ -6,6 +6,11 @@
become: yes
become_user: root
roles:
- - common
- - tg
- - tg_sut
+ - role: common
+ tags: common
+ - role: tg
+ tags: tg
+ - role: tg_sut
+ tags: tg_sut
+ - role: calibration
+ tags: calibration
diff --git a/resources/tools/testbed-setup/ansible/vpp_device.yaml b/resources/tools/testbed-setup/ansible/vpp_device.yaml
index 7f0f6eb91a..3d4894136f 100644
--- a/resources/tools/testbed-setup/ansible/vpp_device.yaml
+++ b/resources/tools/testbed-setup/ansible/vpp_device.yaml
@@ -6,5 +6,7 @@
become: yes
become_user: root
roles:
- - common
- - vpp_device
+ - role: common
+ tags: common
+ - role: vpp_device
+ tags: vpp_device