nodepool: infra-package-needs; cleanup tox installs
The package-maps install of tox is only defined for gentoo, and that came in with the original image build parts. We don't need that any more. 10-pip-packages I didn't trace down, but it hasn't been doing anything for a long time, since we removed pip-and-virtualenv. We can remove that. The install done in 40-install-tox I can not see being used anywhere. It came in with If5397d731e9fb04431482529aed23cd9fdaecc1d but I can't see the venv actually referenced anywhere. I think this has all been replaced by the ensure-tox role (or, indeed, jobs migrating away from tox). Remove it. Change-Id: If3fddd79dde56f4087e465ed8b8013f0f337e0cb
This commit is contained in:
parent
5a6b14875f
commit
75a6a641b1
@ -1,37 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
# implied.
|
||||
#
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# dib-lint: disable=setu setpipefail
|
||||
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
||||
set -x
|
||||
fi
|
||||
set -e
|
||||
|
||||
# NOTE(ianw) 2020-03-11 : for testing images without the
|
||||
# pip-and-virtualenv element or any global installs of tools using
|
||||
# these, skip this.
|
||||
if [ -z ${DIB_PYTHON_PIP+x} ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
packages='tox'
|
||||
|
||||
# non-system root installed packages can interfere with things
|
||||
if [ "${DISTRO_NAME}" != "gentoo" ]; then
|
||||
for package in $packages ; do
|
||||
$DIB_PYTHON_PIP install $package
|
||||
done
|
||||
fi
|
@ -1,33 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (C) 2015 OpenStack Foundation
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
# implied.
|
||||
#
|
||||
# Install tox into a virtualenv
|
||||
# This is in /usr instead of /usr/local due to this bug on precise:
|
||||
# https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588
|
||||
|
||||
# dib-lint: disable=setu setpipefail
|
||||
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
||||
set -x
|
||||
fi
|
||||
set -e
|
||||
|
||||
python3 -m venv /usr/tox-env
|
||||
if [[ ${DIB_RELEASE} == 'xenial' ]]; then
|
||||
# The pip on xenial can't figure out it shouldn't install
|
||||
# the latest pip; this is the last to support 3.5
|
||||
/usr/tox-env/bin/pip install --upgrade pip==20.3.4
|
||||
else
|
||||
/usr/tox-env/bin/pip install --upgrade pip
|
||||
fi
|
||||
/usr/tox-env/bin/pip install tox
|
@ -25,5 +25,4 @@ haveged:
|
||||
iptables:
|
||||
redhat-rpm-config:
|
||||
redhat-lsb-core:
|
||||
tox:
|
||||
gnupg2:
|
||||
|
@ -69,7 +69,6 @@
|
||||
"ntp": "net-misc/ntp",
|
||||
"ntpdate": "net-misc/ntp",
|
||||
"python3-dev": "",
|
||||
"tox": "dev-python/tox",
|
||||
"traceroute": "net-analyzer/traceroute",
|
||||
"uuid-runtime": ""
|
||||
}
|
||||
@ -103,7 +102,6 @@
|
||||
"iptables": "iptables-persistent",
|
||||
"gentoolkit": "",
|
||||
"redhat-rpm-config": "",
|
||||
"redhat-lsb-core": "",
|
||||
"tox": ""
|
||||
"redhat-lsb-core": ""
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user