diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-04-11 12:53:32 +0200 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-04-11 12:53:32 +0200 |
| commit | 21ad943989a6573c6fd74e479d286f2a43ce9ae6 (patch) | |
| tree | df8550fe8aac93fd008f8c0e5993aec8bea9449d | |
| parent | 75df705acd886a83a49692bf557f9bdda4c65a4f (diff) | |
Set additional variables for functest
CI_LOOP, NODE_NAME, and BUILD_TAG are needed for logging info to console.
FUNCTEST_MODE and FUNCTEST_SUITE_NAME are important for stating what level
of testing we do for verify and merge jobs.
Change-Id: Iaa5499155b4b94a1cfc6b5c70fe6f8f7417502a6
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
| -rwxr-xr-x | xci/config/env-vars | 13 | ||||
| -rw-r--r-- | xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index f72a0240..dc9328ee 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -16,15 +16,24 @@ export KEEPALIVED_GIT_URL=${KEEPALIVED_GIT_URL:-https://github.com/evrardjp/ansi export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy export OPNFV_HOST_IP=192.168.122.2 export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/installer/$INSTALLER_TYPE/files/$XCI_FLAVOR -export CI_LOOP=${CI_LOOP:-daily} -export JOB_NAME=${JOB_NAME:-false} + # XCI_CACHE is a cache on localhost where repositories and scenarios are cloned. export XCI_CACHE=${XCI_PATH}/.cache + # OPNFV_XCI_CACHE is similar to XCI_CACHE but refers to the remote OPNFV host. export OPNFV_XCI_CACHE="/root/releng-xci/.cache" export XCI_SCENARIOS_CACHE="${XCI_CACHE}/repos/scenarios" export XCI_PLAYBOOKS=${XCI_PATH}/xci/playbooks +# Functest parameters +export FUNCTEST_MODE=${FUNCTEST_MODE:-"tier"} +export FUNCTEST_SUITE_NAME=${FUNCTEST_SUITE_NAME:-"healthcheck"} + +# CI paremeters +export CI_LOOP=${CI_LOOP:-"daily"} +export BUILD_TAG=${BUILD_TAG:-"notag"} +export NODE_NAME=${NODE_NAME:-$(hostname)} + #------------------------------------------------------------------------------- # Paths where git repositories of XCI Components will be cloned on the OPNFV host #------------------------------------------------------------------------------- diff --git a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 index ee02fc65..f7e78ac8 100644 --- a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 +++ b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 @@ -1,7 +1,7 @@ #!/bin/bash # Variables that we need to pass from XCI to functest -XCI_ENV=(INSTALLER_TYPE XCI_FLAVOR OPENSTACK_OSA_VERSION) +XCI_ENV=(INSTALLER_TYPE XCI_FLAVOR OPENSTACK_OSA_VERSION CI_LOOP BUILD_TAG NODE_NAME FUNCTEST_MODE FUNCTEST_SUITE_NAME) source /root/openrc |