X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Fcommon%2Ftasks%2Fubuntu_bionic.yaml;fp=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Fcommon%2Ftasks%2Fubuntu.yaml;h=d80eb5edaca94f7e98ccb7460b35180a61a386a3;hb=bf3ce71ec5074eb30a866ea8b6e01aad03d58e64;hp=ae606cd494ec03b5e22f05b6ce5e6980fb59050f;hpb=b285fff289f434f0aa988d282a218a9f84e21357;p=csit.git

diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml
similarity index 52%
rename from resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu.yaml
rename to resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml
index ae606cd494..d80eb5edac 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/ubuntu_bionic.yaml
@@ -1,24 +1,17 @@
 ---
-# file: roles/common/tasks/ubuntu.yaml
+# file: roles/common/tasks/ubuntu_bionic.yaml
 
-- name: Copy aarch64 apt sources file
+- name: Copy apt sources file
   template:
-    src: 'files/apt-sources-arm.list'
+    src: 'files/apt-sources_{{ ansible_distribution_release }}_{{ ansible_machine }}.list'
     dest: '/etc/apt/sources.list'
   tags: copy-apt-sources
-  when: ansible_machine == 'aarch64'
-
-- name: Copy x86_64 apt sources file
-  template:
-    src: 'files/apt-sources.list'
-    dest: '/etc/apt/sources.list'
-  tags: copy-apt-sources
-  when: ansible_machine == 'x86_64'
 
 - name: Install CSIT dependencies
   apt:
     name: '{{ item }}'
     state: 'present'
+    cache_valid_time: 3600
     install_recommends: False
   with_items:
     - 'python-apt'