Commit 9b5447a8 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Improved variables.sh and robot scripts

parent 47b5f342

helm/scripts/create_remote_users.sh

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



# Other Stuff

DOCKER_ROBOT_IMAGE=labs.etsi.org:5050/ocf/robot-tests-image

DOCKER_ROBOT_IMAGE=labs.etsi.org:5050/ocf/capif/robot-tests-image

DOCKER_ROBOT_IMAGE_VERSION=1.0



TEST_FOLDER=$CAPIF_BASE_DIR/tests
@@ -98,6 +98,7 @@ then 
    exit -1

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''

if [[ $? -ne 0 ]]

then

helm/scripts/populate_create_remote_dummy_users.sh

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ while getopts ":p:i:h" opt; do 
done



# Other Stuff

DOCKER_ROBOT_IMAGE=labs.etsi.org:5050/ocf/robot-tests-image

DOCKER_ROBOT_IMAGE=labs.etsi.org:5050/ocf/capif/robot-tests-image

DOCKER_ROBOT_IMAGE_VERSION=1.0



TEST_FOLDER=$CAPIF_BASE_DIR/tests
@@ -80,6 +80,7 @@ then 
    exit -1

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''

if [[ $? -ne 0 ]]

then

helm/scripts/populate_remove_remote_dummy_users.sh

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ while getopts ":h" opt; do 
done



# Other Stuff

DOCKER_ROBOT_IMAGE=labs.etsi.org:5050/ocf/robot-tests-image

DOCKER_ROBOT_IMAGE=labs.etsi.org:5050/ocf/capif/robot-tests-image

DOCKER_ROBOT_IMAGE_VERSION=1.0



TEST_FOLDER=$CAPIF_BASE_DIR/tests
@@ -69,6 +69,7 @@ then 
    exit -1

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''

if [[ $? -ne 0 ]]

then

helm/scripts/remove_remote_users.sh

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



# Other Stuff

DOCKER_ROBOT_IMAGE=labs.etsi.org:5050/ocf/robot-tests-image

DOCKER_ROBOT_IMAGE=labs.etsi.org:5050/ocf/capif/robot-tests-image

DOCKER_ROBOT_IMAGE_VERSION=1.0



TEST_FOLDER=$CAPIF_BASE_DIR/tests
@@ -81,6 +81,7 @@ then 
    exit -1

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''

if [[ $? -ne 0 ]]

then

helm/scripts/run_remote_capif_tests.sh

+2 −1
Original line number Diff line number Diff line 
#!/bin/bash

source $(dirname "$(readlink -f "$0")")/variables.sh



DOCKER_ROBOT_IMAGE=labs.etsi.org:5050/ocf/robot-tests-image

DOCKER_ROBOT_IMAGE=labs.etsi.org:5050/ocf/capif/robot-tests-image

DOCKER_ROBOT_IMAGE_VERSION=1.0



TEST_FOLDER=$CAPIF_BASE_DIR/tests
@@ -39,6 +39,7 @@ then 
    exit -1

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''

if [[ $? -ne 0 ]]

then