Commit 131577dc authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'OCF220-improve-run_capif-scripts' into 'staging' 

Resolve "Improve run_capif scripts"

Closes #220

See merge request !197
parents 7fba50de eb006fb2

helm/scripts/run_remote_capif_tests.sh

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ then 
fi



docker pull $DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION || echo "Docker image ($DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION) not present on repository"

docker images|grep -Eq '^'$DOCKER_ROBOT_IMAGE'[ ]+[ ]'$DOCKER_ROBOT_IMAGE_VERSION''

docker images|grep -Eq '^'$DOCKER_ROBOT_IMAGE'([[:space:]]+|:)'$DOCKER_ROBOT_IMAGE_VERSION''

if [[ $? -ne 0 ]]

then

    read -p "Robot image is not present. To continue, Do you want to build it? (y/n)" build_robot_image

services/run_capif_tests.sh

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ then 
fi



docker pull $DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION || echo "Docker image ($DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION) not present on repository"

docker images|grep -Eq '^'$DOCKER_ROBOT_IMAGE'[ ]+[ ]'$DOCKER_ROBOT_IMAGE_VERSION''

docker images|grep -Eq '^'$DOCKER_ROBOT_IMAGE'([[:space:]]+|:)'$DOCKER_ROBOT_IMAGE_VERSION''

if [[ $? -ne 0 ]]

then

    read -p "Robot image is not present. To continue, Do you want to build it? (y/n)" build_robot_image