diff options
Diffstat (limited to 'xci/files/install-lib.sh')
| -rw-r--r-- | xci/files/install-lib.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/xci/files/install-lib.sh b/xci/files/install-lib.sh index 92d1f065..43e1213e 100644 --- a/xci/files/install-lib.sh +++ b/xci/files/install-lib.sh @@ -15,14 +15,13 @@ function install_ansible() { set -eu # Use the upper-constraints file from the pinned requirements repository. - local requirements_sha=$(awk '/requirements_git_install_branch:/ {print $2}' ${XCI_PATH}/xci/installer/osa/files/openstack_services.yml) - local uc="https://raw.githubusercontent.com/openstack/requirements/${requirements_sha}/upper-constraints.txt" + local uc="https://raw.githubusercontent.com/openstack/requirements/${OPENSTACK_REQUIREMENTS_VERSION}/upper-constraints.txt" local install_map declare -A PKG_MAP # workaround: for latest bindep to work, it needs to use en_US local - export LANG=c + export LANG="C" CHECK_CMD_PKGS=( gcc @@ -135,6 +134,7 @@ function install_ansible() { set -u # We are inside the virtualenv now so we should be good to use pip and python from it. + pip -q install --upgrade pip==9.0.3 # We need a version which supports the '-c' parameter pip -q install --upgrade -c $uc ara virtualenv pip setuptools ansible==$XCI_ANSIBLE_PIP_VERSION ansible-lint==3.4.21 ara_location=$(python -c "import os,ara; print(os.path.dirname(ara.__file__))") @@ -144,12 +144,14 @@ function install_ansible() { ansible_lint() { set -eu # Use the upper-constraints file from the pinned requirements repository. - local requirements_sha=$(awk '/requirements_git_install_branch:/ {print $2}' ${XCI_PATH}/xci/installer/osa/files/openstack_services.yml) - local uc="https://raw.githubusercontent.com/openstack/requirements/${requirements_sha}/upper-constraints.txt" + local uc="https://raw.githubusercontent.com/openstack/requirements/${OPENSTACK_REQUIREMENTS_VERSION}/upper-constraints.txt" local playbooks_dir=(xci/playbooks xci/installer/osa/playbooks xci/installer/kubespray/playbooks) # Extract role from scenario information local testing_role=$(sed -n "/^- scenario: ${DEPLOY_SCENARIO}/,/^$/p" ${XCI_PATH}/xci/opnfv-scenario-requirements.yml | grep role | rev | cut -d '/' -f -1 | rev) + # clear XCI_CACHE + rm -rf ${XCI_CACHE}/repos/openstack-ansible-tests + # Clone OSA rules too git clone --quiet --depth 1 https://github.com/openstack/openstack-ansible-tests.git \ ${XCI_CACHE}/repos/openstack-ansible-tests |