From 83187ce009ce31cd11a35e57b0e0dfbb4a135ba8 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Thu, 10 Sep 2020 15:05:25 +0900 Subject: [PATCH] Fix ironic-ui cross job ironic-ui npm job uses phantomjs which requires libfontconfig1. libfontconfig1 is installed via bindep.txt in ironic-ui [1], but in case of horizon it is not a direct dependency of horizon. To handle the situation, this commit adds a playbook to install libfontconfig1 and use it in horizon-cross-ironic-ui-npm job only instead of adding libfontconfig1 to horizon bindep.txt. [1] https://review.opendev.org/#/c/744708/ Change-Id: I525ab42d1d5a16b982f6afdfae0b6544a6c7a057 --- .zuul.d/cross-jobs.yaml | 1 + playbooks/cross-jobs/phantomjs-deps.yaml | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 playbooks/cross-jobs/phantomjs-deps.yaml diff --git a/.zuul.d/cross-jobs.yaml b/.zuul.d/cross-jobs.yaml index 09a4394610..23ff3272af 100644 --- a/.zuul.d/cross-jobs.yaml +++ b/.zuul.d/cross-jobs.yaml @@ -20,6 +20,7 @@ - job: name: horizon-cross-ironic-ui-npm parent: horizon-nodejs10-run-test + pre-run: playbooks/cross-jobs/phantomjs-deps.yaml vars: zuul_work_dir: "{{ zuul.projects['opendev.org/openstack/ironic-ui'].src_dir }}" required-projects: diff --git a/playbooks/cross-jobs/phantomjs-deps.yaml b/playbooks/cross-jobs/phantomjs-deps.yaml new file mode 100644 index 0000000000..d2ff29aff5 --- /dev/null +++ b/playbooks/cross-jobs/phantomjs-deps.yaml @@ -0,0 +1,6 @@ +- hosts: all + tasks: + - name: Install libfontconfig + apt: + name: libfontconfig1 + become: yes