starlingx/tools
Code Issues Proposed changes

Constrain more-itertools for build failure

Browse Source 
A recent update to the more-itertools python module causes a failure
in the STX_BUILD_container_setup CENGN build job. This module dropped
python-2.7 support after its 5.0.0 release. The newest update causes a
failure due to code that does not work with 2.7.

This commit adds a builder-constraints.txt file that the Dockerfile
passes to the pip install command to constrain module versions during
setup of the build container, allowing us to constrain the
more-itertools version to 5.0.0, the last version to officially
support python 2.7.

Change-Id: I3432c204ecd7c4ddedd8a7dea14216d4ec31e0aa
Closes-Bug: 1859642
Signed-off-by: Don Penney <don.penney@windriver.com>
This commit is contained in:
Don Penney 2020-01-14 11:20:50 -05:00
parent 11233cc04c
commit 12c3dc4772
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -109,6 +109,7 @@ COPY toCOPY/populate_downloads.sh /usr/local/bin
COPY toCOPY/generate-cgcs-tis-repo /usr/local/bin COPY toCOPY/generate-cgcs-tis-repo /usr/local/bin
COPY toCOPY/generate-cgcs-centos-repo.sh /usr/local/bin COPY toCOPY/generate-cgcs-centos-repo.sh /usr/local/bin
COPY toCOPY/.inputrc /home/$MYUNAME/ COPY toCOPY/.inputrc /home/$MYUNAME/
COPY toCOPY/builder-constraints.txt /home/$MYUNAME/
# cpan modules, installing with cpanminus to avoid stupid questions since cpan is whack # cpan modules, installing with cpanminus to avoid stupid questions since cpan is whack
RUN cpanm --notest Fatal && \ RUN cpanm --notest Fatal && \
@ -118,8 +119,8 @@ RUN cpanm --notest Fatal && \
cpanm --notest XML::Simple cpanm --notest XML::Simple
# pip installs # pip installs
RUN pip install python-subunit junitxml --upgrade && \ RUN pip install -c /home/$MYUNAME/builder-constraints.txt python-subunit junitxml --upgrade && \
pip install tox --upgrade pip install -c /home/$MYUNAME/builder-constraints.txt tox --upgrade
# Install repo tool # Install repo tool
RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \ RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \

2
toCOPY/builder-constraints.txt Normal file
View File

@ -0,0 +1,2 @@
more-itertools===5.0.0;python_version=='2.7' # Last version with official 2.7 support