openstack/ironic-python-agent-builder
Code Issues Proposed changes

Fix and return the CentOS 7 job

Browse Source 
This job is used on stable branches and is currently broken. This
change introduces a workaround for older DIB and re-enables the job.

Change-Id: I100576c639649a69a8e95463ca87bedda4bbadc3
This commit is contained in:
Dmitry Tantsur 2020-01-20 12:37:41 +01:00
parent 79f597e183
commit 683feac160
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -127,6 +127,8 @@
- ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src - ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src
- ironic-python-agent-check-image-tinyipa - ironic-python-agent-check-image-tinyipa
- ironic-python-agent-check-image-dib-centos8 - ironic-python-agent-check-image-dib-centos8
- ironic-python-agent-check-image-dib-centos7:
voting: false
- ironic-python-agent-check-image-dib-fedora: - ironic-python-agent-check-image-dib-fedora:
voting: false voting: false
- ironic-python-agent-check-image-dib-ubuntu: - ironic-python-agent-check-image-dib-ubuntu:

11
roles/ipa-build-dib-image/tasks/install.yaml
View File

@ -25,3 +25,14 @@
name: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/diskimage-builder'].src_dir }}" name: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/diskimage-builder'].src_dir }}"
become: true become: true
when: dib_from_source when: dib_from_source
# NOTE(dtantsur): work around the issue in older DIB versions when some
# elements try to use the default Python instead of the one DIB is using,
# failing with "No module named yaml"
- name: Install PyYAML in Python 2
pip:
name: PyYAML
extra_args: -c "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
executable: pip2
become: true
ignore_errors: true