From a8a5b1ac77707bd027df6a5c91c7661babe41444 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 2 Apr 2020 11:09:04 +1100 Subject: [PATCH] pip-and-virtualenv : fix fedora 30 install 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 ee9ad32b6fd766dce04d7276c6a7eb489e24741f. 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 --- .zuul.d/jobs.yaml | 1 - .../pip-and-virtualenv-source-install/04-install-pip | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index a5d9b7f05..20958605b 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -95,7 +95,6 @@ # These can only build on bionic dib_functests_extra: - fedora-minimal/build-succeeds - - pip-and-virtualenv/source-install-fedora voting: false - job: diff --git a/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip b/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip index bec0f624a..a1ee32b90 100755 --- a/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip +++ b/diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip @@ -30,8 +30,8 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel|rhel7) ]]; then ;; fedora) _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