diff options
| -rwxr-xr-x | xci/config/pinned-versions | 2 | ||||
| -rw-r--r-- | xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index 874ee6ba..da82c9cd 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -25,6 +25,8 @@ #------------------------------------------------------------------------------- # use releng-xci from master until the development work with the sandbox is complete export OPNFV_RELENG_VERSION="master" +# use functest-healthcheck image that is known to work and contains the original list of testcases +export OPNFV_FUNCTEST_HEALTHCHECK_DOCKER_IMAGE_DIGEST="sha256:faa1ec5778ac1580cc46f0e4f5abec24026868b95fc6fc3ae6023275dc980c2d" # HEAD of bifrost "master" as of 13.02.2018 export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"28b6b8c96f89532bbddeca513285e6c00db89205"} # HEAD of ironic "master" as of 13.02.2018 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 7856cb0e..52bca30b 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 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 OPNFV_FUNCTEST_HEALTHCHECK_DOCKER_IMAGE_DIGEST) # Create directory to store functest logs mkdir -p ~/results/ @@ -60,7 +60,7 @@ sudo docker run --env-file env \ -v $(pwd)/openrc:/home/opnfv/functest/conf/env_file \ -v $(pwd)/images:/home/opnfv/functest/images \ -v $(pwd)/results:/home/opnfv/functest/results \ - $DOCKER_IMAGE_NAME + ${DOCKER_IMAGE_NAME}@${OPNFV_FUNCTEST_HEALTHCHECK_DOCKER_IMAGE_DIGEST} {% else %} {# stuff needed for Kubernetes based scenarios #} # Create k8s.creds file for functest |