sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pip-and-virtualenv : fix fedora 30 install

Browse Source 
This should be installing the python2 and python3 packages (that's
what pip-and-virtualenv is designed to do), but we dropped the +=
accidentally in ee9ad32b6f.

However, we've moved on anyway and after
I7a6a342461d6001c25e55638ba9b7438c28f2519 F31 doesn't support this
element.  fedora-latest is already updated to f31 in the opendev gate.
Remove the testing as it is no longer relevant.

Change-Id: Id696a90baa1eb05cb4c08501f8dac3665d395682
This commit is contained in:
Ian Wienand 2020-04-02 11:09:04 +11:00
parent df3ad26f58
commit a8a5b1ac77
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

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

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

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