Browse Source

Merge "Fix: IPA image building with OpenSuse."

master 2.6.0
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
93292bfd57
5 changed files with 29 additions and 1 deletions
  1. +5
    -0
      dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install
  2. +11
    -0
      dib/ironic-python-agent-ramdisk/pkg-map
  3. +2
    -1
      dib/ironic-python-agent-ramdisk/svc-map
  4. +9
    -0
      zuul.d/ironic-python-agent-builder-jobs.yaml
  5. +2
    -0
      zuul.d/project.yaml

+ 5
- 0
dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install View File

@ -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/


+ 11
- 0
dib/ironic-python-agent-ramdisk/pkg-map View File

@ -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": {


+ 2
- 1
dib/ironic-python-agent-ramdisk/svc-map View File

@ -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

+ 9
- 0
zuul.d/ironic-python-agent-builder-jobs.yaml View File

@ -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


+ 2
- 0
zuul.d/project.yaml View File

@ -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…
Cancel
Save