aboutsummaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
authorrexlee8776 <limingjiang@huawei.com>2017-11-16 08:49:16 +0000
committerRoss Brattain <ross.b.brattain@intel.com>2017-12-16 09:22:04 +0000
commite7338e897892b3d1c484379d8706e503bde684ab (patch)
tree81ff62adfe806bc46386a3c45dd41a84ca12ccbb /ansible
parent7bad2481c956956ce62eff953ae477333b6c4494 (diff)
bugfix: tc078 fails in some situations
1. make "SPECint_benchmark, runspec_iterations, runspec_tune, runspec_size, runspec_rate" parameterized and change the default value "int^429" to "int" 2. remove "become: true" in some roles since it does not need root privilege JIRA: YARDSTICK-852 Change-Id: Icb384bddc12911e2681a981d0504e0e142d1a8ec Signed-off-by: rexlee8776 <limingjiang@huawei.com> (cherry picked from commit 7bd43b239b7be6f478399526a177922d4482bcc2)
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/archive_spec_cpu2006_result/tasks/main.yaml5
-rw-r--r--ansible/roles/fetch_spec_cpu2006_result/tasks/main.yaml3
-rw-r--r--ansible/roles/install_spec_cpu2006/tasks/main.yaml6
-rw-r--r--ansible/roles/unarchive_spec_cpu2006_result/tasks/main.yaml1
-rw-r--r--ansible/roles/uninstall_spec_cpu2006/tasks/main.yaml4
5 files changed, 6 insertions, 13 deletions
diff --git a/ansible/roles/archive_spec_cpu2006_result/tasks/main.yaml b/ansible/roles/archive_spec_cpu2006_result/tasks/main.yaml
index 7f72e1394..0282244ae 100644
--- a/ansible/roles/archive_spec_cpu2006_result/tasks/main.yaml
+++ b/ansible/roles/archive_spec_cpu2006_result/tasks/main.yaml
@@ -10,6 +10,5 @@
- name: archive_spec_cpu2006_result
archive:
- path: /usr/cpu2006/result
- dest: /usr/cpu2006/spec_cpu2006_result.zip
- become: true
+ path: ~/cpu2006/result
+ dest: ~/cpu2006/spec_cpu2006_result.zip
diff --git a/ansible/roles/fetch_spec_cpu2006_result/tasks/main.yaml b/ansible/roles/fetch_spec_cpu2006_result/tasks/main.yaml
index 370ec7a0c..ccc89000c 100644
--- a/ansible/roles/fetch_spec_cpu2006_result/tasks/main.yaml
+++ b/ansible/roles/fetch_spec_cpu2006_result/tasks/main.yaml
@@ -10,7 +10,6 @@
- name: fetch_spec_cpu2006_result
fetch:
- src: /usr/cpu2006/spec_cpu2006_result.zip
+ src: ~/cpu2006/spec_cpu2006_result.zip
dest: /tmp/
flat: yes
- become: true
diff --git a/ansible/roles/install_spec_cpu2006/tasks/main.yaml b/ansible/roles/install_spec_cpu2006/tasks/main.yaml
index baa9f6ca0..ea698f5a2 100644
--- a/ansible/roles/install_spec_cpu2006/tasks/main.yaml
+++ b/ansible/roles/install_spec_cpu2006/tasks/main.yaml
@@ -12,13 +12,11 @@
copy:
src: /home/opnfv/repos/yardstick/yardstick/resources/cpu2006-1.2.iso
dest: ~/cpu2006-1.2.iso
- become: true
- name: install SPEC CPU2006
shell:
- mount -t iso9660 -o ro,exec ~/cpu2006-1.2.iso /mnt;
+ sudo mount -t iso9660 -o ro,exec ~/cpu2006-1.2.iso /mnt;
cd /mnt;
- ./install.sh -fd /usr/cpu2006;
+ ./install.sh -fd ~/cpu2006;
args:
executable: /bin/bash
- become: true
diff --git a/ansible/roles/unarchive_spec_cpu2006_result/tasks/main.yaml b/ansible/roles/unarchive_spec_cpu2006_result/tasks/main.yaml
index 86dcc1aeb..07d15d1a9 100644
--- a/ansible/roles/unarchive_spec_cpu2006_result/tasks/main.yaml
+++ b/ansible/roles/unarchive_spec_cpu2006_result/tasks/main.yaml
@@ -13,4 +13,3 @@
src: /tmp/spec_cpu2006_result.zip
dest: /tmp/
remote_src: True
- become: true
diff --git a/ansible/roles/uninstall_spec_cpu2006/tasks/main.yaml b/ansible/roles/uninstall_spec_cpu2006/tasks/main.yaml
index 72d8c93ee..b2a50896e 100644
--- a/ansible/roles/uninstall_spec_cpu2006/tasks/main.yaml
+++ b/ansible/roles/uninstall_spec_cpu2006/tasks/main.yaml
@@ -10,9 +10,8 @@
- name: remove SPEC CPU 2006
file:
- path: /usr/cpu2006
+ path: ~/cpu2006
state: absent
- become: true
- name: umount SPEC CPU 2006 ISO
shell:
@@ -25,4 +24,3 @@
file:
path: ~/cpu2006-1.2.iso
state: absent
- become: true