summaryrefslogtreecommitdiffstats
path: root/xci
diff options
context:
space:
mode:
Diffstat (limited to 'xci')
-rwxr-xr-xxci/config/env-vars2
-rw-r--r--xci/files/install-lib.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars
index dc9328ee..bf333bdf 100755
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -52,3 +52,5 @@ export XCI_SSL_SUBJECT=${XCI_SSL_SUBJECT:-"/C=US/ST=California/L=San Francisco/O
export DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature"}
# Kubespray requires that ansible version is 2.4.0.0
export XCI_KUBE_ANSIBLE_PIP_VERSION=2.4.0.0
+# OpenStack global requirements version
+export OPENSTACK_REQUIREMENTS_VERSION=${OPENSTACK_REQUIREMENTS_VERSION:-$(awk '/requirements_git_install_branch:/ {print $2}' ${XCI_PATH}/xci/installer/osa/files/openstack_services.yml)}
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)