From 59cfe05e26d58bbb98620671da8bf26343d76a88 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 23 May 2022 16:04:46 +0800 Subject: [PATCH] build_inf_prepare_jenkins: fix for py27 venv and mock_overlay Issue-ID: INF-274 Signed-off-by: Jackie Huang Change-Id: I39e40f21a4b95d92df2120b34109369e02597ac8 --- .../build_inf_centos/build_inf_prepare_jenkins.sh | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh index be6e5e32..6fd38995 100755 --- a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh +++ b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh @@ -217,21 +217,14 @@ sudo pip install -c ${TOOLS_DIR}/toCOPY/builder-constraints.txt \ junitxml \ testtools -# Create a sane py27 virtualenv -virtualenv /opt/py27 && \ - source /opt/py27/bin/activate && \ - sudo pip install -c ${TOOLS_DIR}/toCOPY/builder-opt-py27-constraints.txt \ - tox \ - && \ - for prog in tox ; do \ - ln -s /opt/py27/bin/$prog /usr/bin ; \ - done + # Inherited tools for mock stuff # we at least need the mock_cache_unlock tool # they install into /usr/bin -sudo cp -rf ${TOOLS_DIR}/toCOPY/mock_overlay /opt/mock_overlay -cd /opt/mock_overlay +mkdir -p ${WORKSPACE}/opt +cp -rf ${TOOLS_DIR}/toCOPY/mock_overlay ${WORKSPACE}/opt/mock_overlay +cd ${WORKSPACE}/opt/mock_overlay make sudo make install @@ -303,4 +296,10 @@ sudo rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY* # Try to continue a yum command even if a StarlingX repo is unavailable. sudo yum-config-manager --setopt=StarlingX\*.skip_if_unavailable=1 --save +# Create a sane py27 virtualenv +virtualenv ${WORKSPACE}/opt/py27 +source ${WORKSPACE}/opt/py27/bin/activate +pip install -c ${TOOLS_DIR}/toCOPY/builder-opt-py27-constraints.txt tox +sudo ln -s ${WORKSPACE}/opt/py27/bin/tox /usr/bin + echo_step_end -- 2.16.6