From 973920421d98159a3d91790859061ee718cd1e07 Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 12 Jun 2018 17:39:04 +0200
Subject: xci: Bump OSA and bifrost SHAs

This change
- bumps OSA SHA to cbfdb7dc295ff702044b807336fab067d84a3f20
    (mostly based on Rocky RC1)
- bumps bifrost SHA to c1c6fb7487d5b967624400623fd35aabf303b917
- pins Ansible to 2.4.6.0
- switches to ollivier/functest-healtcheck since OS is bumped to Rocky

Change-Id: Icc14e3e794b489dafd78b426c54051a3732ccb1a
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Signed-off-by: Markos Chandras <mchandras@suse.de>
---
 xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xci/playbooks')

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 52bca30b..6e62a3bb 100644
--- a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2
+++ b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2
@@ -54,13 +54,13 @@ else
 fi
 
 # docker image to use will be different for healthcheck and smoke test
-DOCKER_IMAGE_NAME="opnfv/functest-${FUNCTEST_SUITE_NAME}"
+DOCKER_IMAGE_NAME="ollivier/functest-${FUNCTEST_SUITE_NAME}"
 
 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}@${OPNFV_FUNCTEST_HEALTHCHECK_DOCKER_IMAGE_DIGEST}
+    ${DOCKER_IMAGE_NAME}
 {% else %}
 {# stuff needed for Kubernetes based scenarios #}
 # Create k8s.creds file for functest
-- 
cgit