openstack/ironic-python-agent-builder
Code Issues Proposed changes

Pin pip version to install in tinyipa images

Browse Source 
Since pip needs to be the same during the entire process, let's
pin a version that is supposed to work and use it on both
build and finalise scripts.

Change-Id: I0bbac68bb6e970c2e540d0a03133c3cc828ac44a
This commit is contained in:
Riccardo Pittau 2020-08-20 17:35:30 +02:00
parent 11bb1098a3
commit b609df3111
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tinyipa/build-tinyipa.sh
View File

@ -2,7 +2,7 @@
set -ex set -ex
WORKDIR=$(readlink -f $0 | xargs dirname) WORKDIR=$(readlink -f $0 | xargs dirname)
source ${WORKDIR}/tc-mirror.sh source ${WORKDIR}/common.sh
BUILDDIR="$WORKDIR/tinyipabuild" BUILDDIR="$WORKDIR/tinyipabuild"
TINYCORE_MIRROR_URL=${TINYCORE_MIRROR_URL:-} TINYCORE_MIRROR_URL=${TINYCORE_MIRROR_URL:-}
TINYIPA_REQUIRE_BIOSDEVNAME=${TINYIPA_REQUIRE_BIOSDEVNAME:-false} TINYIPA_REQUIRE_BIOSDEVNAME=${TINYIPA_REQUIRE_BIOSDEVNAME:-false}
@ -187,7 +187,7 @@ fi
# Build python wheels # Build python wheels
$CHROOT_CMD ${TINYIPA_PYTHON_EXE} -m ensurepip $CHROOT_CMD ${TINYIPA_PYTHON_EXE} -m ensurepip
$CHROOT_CMD ${PIP_COMMAND} install --upgrade pip wheel $CHROOT_CMD ${PIP_COMMAND} install --upgrade pip==${PIP_VERSION} wheel
$CHROOT_CMD ${PIP_COMMAND} install pbr $CHROOT_CMD ${PIP_COMMAND} install pbr
$CHROOT_CMD ${PIP_COMMAND} wheel -c /tmp/upper-constraints.txt --wheel-dir /tmp/wheels -r /tmp/ipa-requirements.txt $CHROOT_CMD ${PIP_COMMAND} wheel -c /tmp/upper-constraints.txt --wheel-dir /tmp/wheels -r /tmp/ipa-requirements.txt
if [ -n "$IRONIC_LIB_SOURCE" ]; then if [ -n "$IRONIC_LIB_SOURCE" ]; then

2
tinyipa/common.sh
View File

@ -3,6 +3,8 @@
WORKDIR=$(readlink -f $0 | xargs dirname) WORKDIR=$(readlink -f $0 | xargs dirname)
source ${WORKDIR}/tc-mirror.sh source ${WORKDIR}/tc-mirror.sh
PIP_VERSION="20.2.2"
# Allow an extension to be added to the generated files by specifying # Allow an extension to be added to the generated files by specifying
# $BRANCH_PATH e.g. export BRANCH_PATH=master results in tinyipa-master.gz etc # $BRANCH_PATH e.g. export BRANCH_PATH=master results in tinyipa-master.gz etc
BRANCH_EXT='' BRANCH_EXT=''

2
tinyipa/finalise-tinyipa.sh
View File

@ -160,7 +160,7 @@ fi
# NOTE(rpittau): pip MUST be the same version used in the build script or # NOTE(rpittau): pip MUST be the same version used in the build script or
# dragons will appear and put everything on fire # dragons will appear and put everything on fire
$CHROOT_CMD ${TINYIPA_PYTHON_EXE} -m ensurepip $CHROOT_CMD ${TINYIPA_PYTHON_EXE} -m ensurepip
$CHROOT_CMD ${PIP_COMMAND} install --upgrade pip wheel $CHROOT_CMD ${PIP_COMMAND} install --upgrade pip==${PIP_VERSION} wheel
# If flag is set install python now # If flag is set install python now
if $BUILD_AND_INSTALL_TINYIPA ; then if $BUILD_AND_INSTALL_TINYIPA ; then