summaryrefslogtreecommitdiffstats
path: root/xci/files
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-04-18 19:08:31 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-18 19:08:31 +0000
commitba83783cb24bc3c40d9e43d97d7eeab4d88cb003 (patch)
tree993a2df9034a77edf3d81638c26b5da1ec1ef12e /xci/files
parentae5d633100fe34b36e3d3320a7c1faa69904870e (diff)
parentb9f6aec722aa14c1052b4b66a33f23ebc4bae92c (diff)
Merge "Export OPENSTACK_REQUIREMENTS_VERSION"
Diffstat (limited to 'xci/files')
-rw-r--r--xci/files/install-lib.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/xci/files/install-lib.sh b/xci/files/install-lib.sh
index a01e7e01..1a6c0b2f 100644
--- a/xci/files/install-lib.sh
+++ b/xci/files/install-lib.sh
@@ -15,8 +15,7 @@ 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
@@ -144,8 +143,7 @@ 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)