9 files changed, 59 insertions, 0 deletions
diff --git a/ansible/roles/build_yardstick_image/tasks/post_build.yml b/ansible/roles/build_yardstick_image/tasks/post_build.yml
index c6888f8df..abbf57c03 100644
--- a/ansible/roles/build_yardstick_image/tasks/post_build.yml
+++ b/ansible/roles/build_yardstick_image/tasks/post_build.yml
@@ -35,6 +35,10 @@
     state: unmounted
 
 - mount:
+    name: "{{ mountdir }}/run"
+    state: unmounted
+
+- mount:
     name: "{{ mountdir }}"
     state: unmounted
 
@@ -44,3 +48,20 @@
 
 - debug:
     msg: "yardstick image = {{ imgfile }}"
+
+- set_fact:
+    imgdest: "/var/lib/libvirt/images/{{ imgfile | basename}}"
+    name: "{{ (imgfile | basename | splitext)[0] }}"
+    ext: "{{ (imgfile | basename | splitext)[1] }}"
+
+- name: Verify if imgfile exists in libvirt images
+  stat:
+    path: "{{ imgdest }}"
+  register: imgdest_stat
+
+- set_fact:
+    imgdest: "/var/lib/libvirt/images/{{ name }}_autogen{{ ext }}"
+  when: imgdest_stat.stat.exists
+
+- name: Copy image to libvirt images
+  shell: "cp {{ imgfile }} {{ imgdest }}"
diff --git a/ansible/roles/build_yardstick_image/tasks/pre_build.yml b/ansible/roles/build_yardstick_image/tasks/pre_build.yml
index 2dae38060..3ac8e90e9 100644
--- a/ansible/roles/build_yardstick_image/tasks/pre_build.yml
+++ b/ansible/roles/build_yardstick_image/tasks/pre_build.yml
@@ -45,6 +45,7 @@
   with_items:
     # order matters
     - "{{ mountdir }}/proc"
+    - "{{ mountdir }}/run"
     - "{{ mountdir }}"
     - "/mnt/{{ release }}"
 
@@ -178,6 +179,17 @@
     fstab: "{{ fake_fstab }}"
     state: mounted
 
+- name: mount chroot /run
+  mount:
+    src: /run
+    name: "{{ mountdir }}/run"
+    fstype: tmpfs
+    opts: bind
+    # !!!!!!! this is required otherwise we add entries to /etc/fstab
+    # and prevent the system from booting
+    fstab: "{{ fake_fstab }}"
+    state: mounted
+
 - name: if arm copy qemu-aarch64-static into chroot
   copy:
     src: /usr/bin/qemu-aarch64-static
diff --git a/ansible/roles/download_civetweb/tasks/main.yml b/ansible/roles/download_civetweb/tasks/main.yml
index 03dd3ccd3..b6a475774 100644
--- a/ansible/roles/download_civetweb/tasks/main.yml
+++ b/ansible/roles/download_civetweb/tasks/main.yml
@@ -18,6 +18,10 @@
     dest: "{{ clone_dest }}/"
     validate_certs: False
     checksum: "{{ civetweb_sha256s }}"
+  register: package_result
+  until: package_result is succeeded
+  retries: 10
+  delay: 5
 
 - name: unarchive civetweb
   unarchive:
diff --git a/ansible/roles/download_dpdk/tasks/main.yml b/ansible/roles/download_dpdk/tasks/main.yml
index 55b466cb7..e434536a3 100644
--- a/ansible/roles/download_dpdk/tasks/main.yml
+++ b/ansible/roles/download_dpdk/tasks/main.yml
@@ -26,6 +26,10 @@
     dest: "{{ dpdk_dest }}"
     validate_certs: False
     checksum: "{{ dpdk_md5[dpdk_version] }}"
+  register: package_result
+  until: package_result is succeeded
+  retries: 10
+  delay: 5
 
 - unarchive:
     src: "{{ dpdk_dest }}/{{ dpdk_file }}"
diff --git a/ansible/roles/download_drivers/tasks/i40evf.yml b/ansible/roles/download_drivers/tasks/i40evf.yml
index cb8a09d6c..48a0330ab 100644
--- a/ansible/roles/download_drivers/tasks/i40evf.yml
+++ b/ansible/roles/download_drivers/tasks/i40evf.yml
@@ -23,6 +23,10 @@
     dest: "{{ i40evf_dest }}/{{ i40evf_gzfile }}"
     validate_certs: False
     checksum: "{{ i40evf_checksum[i40evf_version] }}"
+  register: package_result
+  until: package_result is succeeded
+  retries: 10
+  delay: 5
 
 - name: Unarchive the i40evf file
   unarchive:
diff --git a/ansible/roles/download_l2fwd/tasks/main.yml b/ansible/roles/download_l2fwd/tasks/main.yml
index 7f2ea25c4..43b0ec366 100644
--- a/ansible/roles/download_l2fwd/tasks/main.yml
+++ b/ansible/roles/download_l2fwd/tasks/main.yml
@@ -20,6 +20,10 @@
   get_url:
     url: "{{ l2fwd_url }}"
     dest: "{{ l2fwd_dest }}"
+  register: package_result
+  until: package_result is succeeded
+  retries: 10
+  delay: 5
 
 - unarchive:
     src: "{{ l2fwd_dest }}/{{ l2fwd_file }}"
diff --git a/ansible/roles/download_pktgen/tasks/main.yml b/ansible/roles/download_pktgen/tasks/main.yml
index ff71f207d..b5ac8cfe8 100644
--- a/ansible/roles/download_pktgen/tasks/main.yml
+++ b/ansible/roles/download_pktgen/tasks/main.yml
@@ -22,6 +22,10 @@
     dest: "{{ pktgen_dest }}"
     validate_certs: False
     checksum: "{{ pktgen_sha256s[pktgen_version] }}"
+  register: package_result
+  until: package_result is succeeded
+  retries: 10
+  delay: 5
 
 - unarchive:
     src: "{{ pktgen_dest }}/{{ pktgen_file }}"
diff --git a/ansible/roles/download_trex/tasks/main.yml b/ansible/roles/download_trex/tasks/main.yml
index 9df67d939..44449a9c0 100644
--- a/ansible/roles/download_trex/tasks/main.yml
+++ b/ansible/roles/download_trex/tasks/main.yml
@@ -23,6 +23,10 @@
     dest: "{{ trex_dest }}"
     validate_certs: False
     checksum: "{{ trex_sha256s[trex_version] }}"
+  register: package_result
+  until: package_result is succeeded
+  retries: 10
+  delay: 5
 
 - name: unarchive Trex
   unarchive:
diff --git a/ansible/roles/install_image_dependencies/defaults/main.yml b/ansible/roles/install_image_dependencies/defaults/main.yml
index 42951bf6d..558e68a9b 100644
--- a/ansible/roles/install_image_dependencies/defaults/main.yml
+++ b/ansible/roles/install_image_dependencies/defaults/main.yml
@@ -30,6 +30,7 @@ install_dependencies:
     - libxss-dev
     - expect
     - libnuma-dev
+    - curl
   RedHat:
     - bc
     - fio
@@ -50,3 +51,4 @@ install_dependencies:
     - sysstat
     - unzip
     - python-devel
+    - curl