From 4ba399eaf8ca3beff2dfa554f7f187e6d67b9073 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Thu, 30 Nov 2017 10:46:45 +0000 Subject: Specify supported architectures for Ubuntu backports repository Currently Trusty (Ubuntu 14.04 LTS) and Xenial (Ubuntu 16.04 LTS) doesn't have support for arch=ARM64 in backports repository: - http://archive.ubuntu.com/ubuntu/dists/xenial-backports/ - http://archive.ubuntu.com/ubuntu/dists/trusty-backports/ During the Yardstick image building process, the repository is added to the APT repository list. In order to avoid errors during the repository retrival, the available architectures must be specified [1]. [1]https://github.com/opnfv/yardstick/blob/stable/euphrates/ansible/roles/add_custom_repos/templates/sources.list.j2#L4 JIRA: YARDSTICK-874 Change-Id: I7774189fbdd7d74ff5df29526ba0da2693b3b53a Signed-off-by: Rodolfo Alonso Hernandez --- ansible/roles/add_custom_repos/templates/sources.list.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ansible/roles') diff --git a/ansible/roles/add_custom_repos/templates/sources.list.j2 b/ansible/roles/add_custom_repos/templates/sources.list.j2 index af741cb10..4b50f45ce 100644 --- a/ansible/roles/add_custom_repos/templates/sources.list.j2 +++ b/ansible/roles/add_custom_repos/templates/sources.list.j2 @@ -1,5 +1,5 @@ {% if YARD_IMG_ARCH == "arm64" %} deb [arch={{ YARD_IMG_ARCH }}] http://ports.ubuntu.com/ {{ release }}-backports main restricted universe multiverse {% else %} -deb http://archive.ubuntu.com/ubuntu/ {{ release }}-backports main restricted universe multiverse +deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ {{ release }}-backports main restricted universe multiverse {% endif %} -- cgit 1.2.3-korg From c241da7a6d6218320a162efd714ddc4b1e064341 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Thu, 30 Nov 2017 14:13:34 +0000 Subject: Check if multiverse repository is available in Ubuntu In Ubuntu, multiverse repository is needed to install the image dependencies [1]. If this repository is not enabled, it should be added as part of the role "add_custom_repos". [1] https://github.com/opnfv/yardstick/tree/master/ansible/roles/install_image_dependencies JIRA: YARDSTICK-875 Change-Id: Ie37ebf87bf245185447f2b675568af9bd38219c0 Signed-off-by: Rodolfo Alonso Hernandez --- ansible/roles/add_custom_repos/tasks/ubuntu.yml | 7 +++++++ ansible/roles/add_custom_repos/templates/sources.list.j2 | 3 +++ 2 files changed, 10 insertions(+) (limited to 'ansible/roles') diff --git a/ansible/roles/add_custom_repos/tasks/ubuntu.yml b/ansible/roles/add_custom_repos/tasks/ubuntu.yml index c0ba89c0b..4658fe514 100644 --- a/ansible/roles/add_custom_repos/tasks/ubuntu.yml +++ b/ansible/roles/add_custom_repos/tasks/ubuntu.yml @@ -12,6 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. --- +- name: Check multiverse repository + shell: "apt-cache policy | grep {{ release }}/multiverse" + args: + executable: /bin/bash + register: multiverse_repos + ignore_errors: yes + - name: add custom repos template: src: sources.list.j2 diff --git a/ansible/roles/add_custom_repos/templates/sources.list.j2 b/ansible/roles/add_custom_repos/templates/sources.list.j2 index 4b50f45ce..61fbe43aa 100644 --- a/ansible/roles/add_custom_repos/templates/sources.list.j2 +++ b/ansible/roles/add_custom_repos/templates/sources.list.j2 @@ -2,4 +2,7 @@ deb [arch={{ YARD_IMG_ARCH }}] http://ports.ubuntu.com/ {{ release }}-backports main restricted universe multiverse {% else %} deb [arch=amd64,i386] http://archive.ubuntu.com/ubuntu/ {{ release }}-backports main restricted universe multiverse + {% if multiverse_repos.rc != 0 %} +deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ {{ release }} multiverse + {% endif %} {% endif %} -- cgit 1.2.3-korg