diff options
| -rwxr-xr-x | xci/config/env-vars | 1 | ||||
| -rw-r--r-- | xci/playbooks/roles/prepare-tests/templates/prepare-tests.sh.j2 | 2 | ||||
| -rw-r--r-- | xci/playbooks/roles/prepare-tests/templates/run-functest.sh.j2 | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index 7ab7e2ba..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"} diff --git a/xci/playbooks/roles/prepare-tests/templates/prepare-tests.sh.j2 b/xci/playbooks/roles/prepare-tests/templates/prepare-tests.sh.j2 index afc1cbbe..1b779cb9 100644 --- a/xci/playbooks/roles/prepare-tests/templates/prepare-tests.sh.j2 +++ b/xci/playbooks/roles/prepare-tests/templates/prepare-tests.sh.j2 @@ -1,7 +1,7 @@ #!/bin/bash # Variables that we need to pass from XCI to testing -XCI_ENV=(INSTALLER_TYPE XCI_FLAVOR OPENSTACK_OSA_VERSION CI_LOOP BUILD_TAG NODE_NAME FUNCTEST_MODE FUNCTEST_SUITE_NAME) +XCI_ENV=(INSTALLER_TYPE XCI_FLAVOR OPENSTACK_OSA_VERSION CI_LOOP BUILD_TAG NODE_NAME FUNCTEST_MODE FUNCTEST_SUITE_NAME FUNCTEST_VERSION) # Extract variables from xci.env file if [[ -e /root/xci.env ]]; then diff --git a/xci/playbooks/roles/prepare-tests/templates/run-functest.sh.j2 b/xci/playbooks/roles/prepare-tests/templates/run-functest.sh.j2 index acd19d19..b4cf46d7 100644 --- a/xci/playbooks/roles/prepare-tests/templates/run-functest.sh.j2 +++ b/xci/playbooks/roles/prepare-tests/templates/run-functest.sh.j2 @@ -32,7 +32,7 @@ ls -al . && cd ~ echo "------------------------------------------------------" # docker image to use will be different for healthcheck and smoke test -DOCKER_IMAGE_NAME="ollivier/functest-${FUNCTEST_SUITE_NAME}" +DOCKER_IMAGE_NAME="opnfv/functest-${FUNCTEST_SUITE_NAME}:${FUNCTEST_VERSION}" sudo docker run --env-file env \ -v $(pwd)/openrc:/home/opnfv/functest/conf/env_file \ |