2 files changed, 14 insertions, 11 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/kernel_install.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/kernel_install.yaml
index 5f8a0590bf..4f7800b249 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/kernel_install.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/kernel_install.yaml
@@ -1,7 +1,7 @@
 ---
 # file: roles/common/tasks/kernel_install.yaml
 
-- name: Kernel VM: Backup remote initramfs modules
+- name: Kernel VM - Backup remote initramfs modules
   copy:
     src: '/etc/initramfs-tools/modules'
     dest: '/tmp/initramfs_modules.bkp'
@@ -10,7 +10,7 @@
   register: __initramfs_modules_backuped
   tags: install-kernel-image
 
-- name: Kernel VM: Backup remote initramfs resume config
+- name: Kernel VM - Backup remote initramfs resume config
   copy:
     src: '/etc/initramfs-tools/conf.d/resume'
     dest: '/tmp/initramfs-resume.bkp'
@@ -19,59 +19,61 @@
   register: __initramfs_resume_backuped
   tags: install-kernel-image
 
-- name: Kernel VM: Update remote initramfs modules
+- name: Kernel VM - Update remote initramfs modules
   copy:
     src: '../files/initramfs_modules'
     dest: '/etc/initramfs-tools/modules'
   tags: install-kernel-image
 
-- name: Kernel VM: Update remote initramfs resume config
+- name: Kernel VM - Update remote initramfs resume config
   copy:
     src: '../files/initramfs_resume'
     dest: '/etc/initramfs-tools/conf.d/resume'
   tags: install-kernel-image
 
-- name: Kernel VM: Create target kernel dir
+- name: Kernel VM - Create target kernel dir
   file:
     path: '/opt/boot'
     state: 'directory'
   tags: install-kernel-image
 
-- name: Kernel VM: Build initrd image
+- name: Kernel VM - Build initrd image
   shell: 'update-initramfs -k {{ ansible_kernel }} -c -b /opt/boot'
   tags: install-kernel-image
 
-- name: Kernel VM: Copy corresponding kernel img
+- name: Kernel VM - Copy corresponding kernel img
   copy:
     src: '/boot/vmlinuz-{{ ansible_kernel }}'
     dest: '/opt/boot/vmlinuz-{{ ansible_kernel }}'
     remote_src: yes
   tags: install-kernel-image
 
-- name: Kernel VM: Restore remote initramfs modules
+- name: Kernel VM - Restore remote initramfs modules
   copy:
     src: '/tmp/initramfs_modules.bkp'
     dest: '/etc/initramfs-tools/modules'
     remote_src: yes
+  ignore_errors: yes
   when: __initramfs_modules_backuped
   tags: install-kernel-image
 
-- name: Kernel VM: Remove remote backup initramfs modules
+- name: Kernel VM - Remove remote backup initramfs modules
   file:
     path: '/tmp/initramfs_modules.bkp'
     state: 'absent'
   when: __initramfs_modules_backuped
   tags: install-kernel-image
 
-- name: Kernel VM: Restore remote initramfs resume config
+- name: Kernel VM - Restore remote initramfs resume config
   copy:
     src: '/tmp/initramfs-resume.bkp'
     dest: '/etc/initramfs-tools/conf.d/resume'
     remote_src: yes
+  ignore_errors: yes
   when: __initramfs_resume_backuped
   tags: install-kernel-image
 
-- name: Kernel VM: Remove remote backup initramfs resume config
+- name: Kernel VM - Remove remote backup initramfs resume config
   file:
     path: '/tmp/initramfs-resume.bkp'
     state: 'absent'
diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
index 96e3f83e1b..fb0d77d18c 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
@@ -56,6 +56,7 @@
 
 - name: Install distribution - release - machine prerequisites
   include_tasks: '{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml'
+  tags: [ install-csit-dependencies, copy-apt-sources ]
 
 - name: Set sudoers admin
   lineinfile: