summaryrefslogtreecommitdiffstats
path: root/xci/playbooks/roles
diff options
context:
space:
mode:
Diffstat (limited to 'xci/playbooks/roles')
-rw-r--r--xci/playbooks/roles/prepare-tests/templates/prepare-tests.sh.j22
-rw-r--r--xci/playbooks/roles/prepare-tests/templates/run-functest.sh.j22
2 files changed, 2 insertions, 2 deletions
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 \