Merge "Fix: IPA image building with OpenSuse."
This commit is contained in:
commit
93292bfd57
@ -48,6 +48,11 @@ if [ $HAS_PIP == "False" ]; then
|
||||
$VENVDIR/bin/pip install "pip==$REQUIRED_PIP_STR"
|
||||
fi
|
||||
|
||||
# Upgrade setuptools package for openSuse
|
||||
if [ "$DISTRO_NAME" == "opensuse" ]; then
|
||||
$VENVDIR/bin/pip install -U setuptools
|
||||
fi
|
||||
|
||||
# install IPA inside the virtual environment
|
||||
$VENVDIR/bin/pip install -c $UPPER_CONSTRAINTS $IPADIR
|
||||
ln -s $VENVDIR/bin/ironic-python-agent /usr/local/bin/
|
||||
|
@ -32,6 +32,17 @@
|
||||
"debian": {
|
||||
"python": "python3",
|
||||
"python-dev": "python3-dev"
|
||||
},
|
||||
"suse": {
|
||||
"qemu-utils": "qemu",
|
||||
"python": "python3",
|
||||
"genisoimage": "mkisofs",
|
||||
"gdisk": "gptfdisk",
|
||||
"libffi-dev": "libffi-devel",
|
||||
"libssl-dev": "libopenssl-devel",
|
||||
"python-dev": "python3-devel",
|
||||
"git": "",
|
||||
"man-db": ""
|
||||
}
|
||||
},
|
||||
"default": {
|
||||
|
@ -1,4 +1,5 @@
|
||||
ironic-python-agent:
|
||||
default: openstack-ironic-python-agent
|
||||
redhat: openstack-ironic-python-agent
|
||||
debian: ironic-python-agent
|
||||
debian: ironic-python-agent
|
||||
opensuse: ironic-python-agent
|
||||
|
@ -120,6 +120,15 @@
|
||||
image_type: 'dib'
|
||||
image_distro: 'fedora'
|
||||
|
||||
- job:
|
||||
name: ironic-python-agent-check-image-dib-opensuse
|
||||
parent: ironic-python-agent-check-image-base
|
||||
required-projects:
|
||||
- openstack/diskimage-builder
|
||||
vars:
|
||||
image_type: 'dib'
|
||||
image_distro: 'opensuse'
|
||||
|
||||
- job:
|
||||
name: ironic-python-agent-check-image-dib-debian
|
||||
parent: ironic-python-agent-check-image-base
|
||||
|
@ -22,6 +22,8 @@
|
||||
voting: false
|
||||
- ironic-python-agent-check-image-dib-ubuntu:
|
||||
voting: false
|
||||
- ironic-python-agent-check-image-dib-opensuse:
|
||||
voting: false
|
||||
- ipa-tempest-wholedisk-bios-ipmi-direct-dib-src:
|
||||
voting: false
|
||||
- ipa-tempest-bios-ipmi-iscsi-src:
|
||||
|
Loading…
Reference in New Issue
Block a user