diff options
Diffstat (limited to 'xci/config/env-vars')
| -rwxr-xr-x | xci/config/env-vars | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index 0458f311..a90e8533 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -8,10 +8,16 @@ export OPNFV_RELENG_GIT_URL=${OPNFV_RELENG_GIT_URL:-https://gerrit.opnfv.org/ger export OPENSTACK_BIFROST_GIT_URL=${OPENSTACK_BIFROST_GIT_URL:-https://git.openstack.org/openstack/bifrost} export OPENSTACK_OSA_GIT_URL=${OPENSTACK_OSA_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible} export OPENSTACK_OSA_OPENRC_GIT_URL=${OPENSTACK_OSA_OPENRC_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible-openstack_openrc} -export KUBESPRAY_GIT_URL=${KUBESPRAY_GIT_URL:-https://github.com/kubernetes-incubator/kubespray.git} +export KUBESPRAY_GIT_URL=${KUBESPRAY_GIT_URL:-https://github.com/kubernetes-sigs/kubespray.git} +export OSH_GIT_URL=${OSH_GIT_URL:-https://github.com/openstack/openstack-helm.git} +export OSH_INFRA_GIT_URL=${OSH_INFRA_GIT_URL:-https://github.com/openstack/openstack-helm-infra.git} export OPENSTACK_OSA_HAPROXY_GIT_URL=${OPENSTACK_OSA_HAPROXY_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible-haproxy_server} export KEEPALIVED_GIT_URL=${KEEPALIVED_GIT_URL:-https://github.com/evrardjp/ansible-keepalived} +export OSH_HELM_BINARY_URL=${OSH_HELM_BINARY_URL:-https://storage.googleapis.com/kubernetes-helm} +export OSH_HELM_BINARY_VERSION=${OSH_HELM_BINARY_VERSION:-v2.13.1} + + # Configuration export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy export OPNFV_HOST_IP=192.168.122.2 @@ -28,7 +34,8 @@ 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"} +# TODO: Investigate and fix why the env var FUNCTEST_VERSION set by Jenkins job doesn't take effect +export FUNCTEST_VERSION=${FUNCTEST_VERSION:-"hunter"} # CI paremeters export CI_LOOP=${CI_LOOP:-"daily"} @@ -50,7 +57,7 @@ export LOG_PATH=${LOG_PATH:-${XCI_PATH}/xci/logs} # https://github.com/ansible/ansible/commit/67859c3476501d5d9839fd904aec55468d09593a # This was fixed in 2.5.6 so remove the pin when OSA updates to newer version. #export XCI_ANSIBLE_PIP_VERSION=${XCI_ANSIBLE_PIP_VERSION:-$(curl -s https://raw.githubusercontent.com/openstack/openstack-ansible/${OPENSTACK_OSA_VERSION}/scripts/bootstrap-ansible.sh | grep ansible== | sed -n "s/.*ansible==\([0-9.]*\).*/\1/p")} -export XCI_ANSIBLE_PIP_VERSION="2.5.8" +export XCI_ANSIBLE_PIP_VERSION="2.7.8" export ANSIBLE_HOST_KEY_CHECKING=False export DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature"} |