X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fbuild_inf_centos%2Fbuild_inf_prepare_jenkins.sh;fp=scripts%2Fbuild_inf_centos%2Fbuild_inf_prepare_jenkins.sh;h=6fd389950d2746647c2506165bd00559407bf16a;hb=59cfe05e26d58bbb98620671da8bf26343d76a88;hp=be6e5e32fec142a122ac48fce66b632b1d402a21;hpb=e7f2f4ff40affa3d6559078563b99b6fdc1845c2;p=pti%2Frtp.git diff --git a/scripts/build_inf_centos/build_inf_prepare_jenkins.sh b/scripts/build_inf_centos/build_inf_prepare_jenkins.sh index be6e5e3..6fd3899 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