openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "pip-and-virtualenv : fix fedora 30 install"

This commit is contained in:
Zuul 2020-04-24 05:34:35 +00:00 committed by Gerrit Code Review
parent 0d0a5909e7 a8a5b1ac77
commit 534b799de8
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.d/jobs.yaml
View File

@ -93,7 +93,6 @@
# These can only build on bionic
dib_functests_extra:
- fedora-minimal/build-succeeds
- pip-and-virtualenv/source-install-fedora
voting: false
- job:

4
diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip
View File

@ -34,8 +34,8 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel|rhel7) ]]; then
exit 1
fi
_do_py3=1
packages="python2-virtualenv python2-pip python2-setuptools"
packages=" python3-virtualenv python3-pip python3-setuptools"
packages="python2-pip python2-setuptools"
packages+=" python3-virtualenv python3-pip python3-setuptools"
;;
rhel)
case "$DIB_RELEASE" in