summaryrefslogtreecommitdiffstats
path: root/xci/config
diff options
context:
space:
mode:
Diffstat (limited to 'xci/config')
-rwxr-xr-xxci/config/env-vars3
-rwxr-xr-xxci/config/pinned-versions4
2 files changed, 3 insertions, 4 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars
index e8472a0d..0458f311 100755
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -28,6 +28,7 @@ export XCI_PLAYBOOKS=${XCI_PATH}/xci/playbooks
# Functest parameters
export FUNCTEST_MODE=${FUNCTEST_MODE:-"tier"}
export FUNCTEST_SUITE_NAME=${FUNCTEST_SUITE_NAME:-"healthcheck"}
+export FUNCTEST_VERSION=${FUNCTEST_VERSION:-"latest"}
# CI paremeters
export CI_LOOP=${CI_LOOP:-"daily"}
@@ -52,8 +53,6 @@ export LOG_PATH=${LOG_PATH:-${XCI_PATH}/xci/logs}
export XCI_ANSIBLE_PIP_VERSION="2.5.8"
export ANSIBLE_HOST_KEY_CHECKING=False
-# subject of the certificate
-export XCI_SSL_SUBJECT=${XCI_SSL_SUBJECT:-"/C=US/ST=California/L=San Francisco/O=IT/CN=xci.releng.opnfv.org"}
export DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature"}
# attempt to sync Ansible version used by Kubespray with the rest
export XCI_KUBE_ANSIBLE_PIP_VERSION=$XCI_ANSIBLE_PIP_VERSION
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions
index 0581a981..69892b40 100755
--- a/xci/config/pinned-versions
+++ b/xci/config/pinned-versions
@@ -35,8 +35,8 @@ export BIFROST_IRONIC_CLIENT_VERSION=${BIFROST_IRONIC_CLIENT_VERSION:-"b29646d0e
export BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-"403888919bc7f40c1c51f32fe23dff44da3cbcca"}
# HEAD of ironic-inspector-client "stable/rocky" as of 30.08.2018
export BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION:-"eb588de8ba69d750223b024b24346c088c023272"}
-# HEAD of osa "stable/rocky" as of 30.08.2018
-export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"b9d9269528ecbe04b2638a73c2b0f49839f27422"}
+# HEAD of osa "stable/rocky" as of 07.09.2018
+export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"ff6161e7f08b8ffe9ff6e0552517ea3f10292cf8"}
export KEEPALIVED_VERSION=$(grep -E '.*name: keepalived' -A 3 \
${XCI_PATH}/xci/installer/osa/files/ansible-role-requirements.yml \
| tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p')