Commit f3e63992 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'staging' into... 

Merge branch 'staging' into 'OCF176-design-of-logic-to-read-all-apis-in-discover-operation-and-filtering'

# Conflicts:
#   tools/robot/Dockerfile
parents 451a6557 e82eafcd

helm/scripts/create_remote_users.sh

+1 −9
Original line number Diff line number Diff line
@@ -73,14 +73,6 @@ then 
    exit -1

fi



# Other Stuff

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

DOCKER_ROBOT_IMAGE_VERSION=1.0



TEST_FOLDER=$CAPIF_BASE_DIR/tests

RESULT_FOLDER=$CAPIF_BASE_DIR/results

ROBOT_DOCKER_FILE_FOLDER=$CAPIF_BASE_DIR/tools/robot



# nginx Hostname and http port (80 by default) to reach for tests

CAPIF_REGISTER=$REGISTER_HOSTNAME

CAPIF_REGISTER_PORT=443
@@ -144,7 +136,7 @@ cd $CAPIF_BASE_DIR 


mkdir -p $RESULT_FOLDER



docker run -ti --rm --network="host" \

docker run $DOCKER_ROBOT_TTY_OPTIONS --rm --network="host" \

  -v $TEST_FOLDER:/opt/robot-tests/tests \

  -v $RESULT_FOLDER:/opt/robot-tests/results ${DOCKER_ROBOT_IMAGE}:${DOCKER_ROBOT_IMAGE_VERSION}  \

  --variable CAPIF_HOSTNAME:$CAPIF_HOSTNAME \

helm/scripts/populate_create_remote_dummy_users.sh

+1 −9
Original line number Diff line number Diff line
@@ -54,14 +54,6 @@ while getopts ":p:i:h" opt; do 
  esac

done



# Other Stuff

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

DOCKER_ROBOT_IMAGE_VERSION=1.0



TEST_FOLDER=$CAPIF_BASE_DIR/tests

RESULT_FOLDER=$CAPIF_BASE_DIR/results

ROBOT_DOCKER_FILE_FOLDER=$CAPIF_BASE_DIR/tools/robot



# nginx Hostname and http port (80 by default) to reach for tests

CAPIF_REGISTER=$REGISTER_HOSTNAME

CAPIF_REGISTER_PORT=443
@@ -125,7 +117,7 @@ cd $CAPIF_BASE_DIR 


mkdir -p $RESULT_FOLDER



docker run -ti --rm --network="host" \

docker run $DOCKER_ROBOT_TTY_OPTIONS --rm --network="host" \

  -v $TEST_FOLDER:/opt/robot-tests/tests \

  -v $RESULT_FOLDER:/opt/robot-tests/results ${DOCKER_ROBOT_IMAGE}:${DOCKER_ROBOT_IMAGE_VERSION}  \

  --variable CAPIF_HOSTNAME:$CAPIF_HOSTNAME \

helm/scripts/populate_remove_remote_dummy_users.sh

+1 −9
Original line number Diff line number Diff line
@@ -44,14 +44,6 @@ while getopts ":h" opt; do 
  esac

done



# Other Stuff

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

DOCKER_ROBOT_IMAGE_VERSION=1.0



TEST_FOLDER=$CAPIF_BASE_DIR/tests

RESULT_FOLDER=$CAPIF_BASE_DIR/results

ROBOT_DOCKER_FILE_FOLDER=$CAPIF_BASE_DIR/tools/robot



# nginx Hostname and http port (80 by default) to reach for tests

CAPIF_REGISTER=$REGISTER_HOSTNAME

CAPIF_REGISTER_PORT=443
@@ -115,7 +107,7 @@ cd $CAPIF_BASE_DIR 


mkdir -p $RESULT_FOLDER



docker run -ti --rm --network="host" \

docker run $DOCKER_ROBOT_TTY_OPTIONS --rm --network="host" \

  -v $TEST_FOLDER:/opt/robot-tests/tests \

  -v $RESULT_FOLDER:/opt/robot-tests/results ${DOCKER_ROBOT_IMAGE}:${DOCKER_ROBOT_IMAGE_VERSION}  \

  --variable CAPIF_HOSTNAME:$CAPIF_HOSTNAME \

helm/scripts/remove_remote_users.sh

+1 −9
Original line number Diff line number Diff line
@@ -56,14 +56,6 @@ then 
    exit -1

fi



# Other Stuff

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

DOCKER_ROBOT_IMAGE_VERSION=1.0



TEST_FOLDER=$CAPIF_BASE_DIR/tests

RESULT_FOLDER=$CAPIF_BASE_DIR/results

ROBOT_DOCKER_FILE_FOLDER=$CAPIF_BASE_DIR/tools/robot



# nginx Hostname and http port (80 by default) to reach for tests

CAPIF_REGISTER=$REGISTER_HOSTNAME

CAPIF_REGISTER_PORT=443
@@ -127,7 +119,7 @@ cd $CAPIF_BASE_DIR 


mkdir -p $RESULT_FOLDER



docker run -ti --rm --network="host" \

docker run $DOCKER_ROBOT_TTY_OPTIONS --rm --network="host" \

  -v $TEST_FOLDER:/opt/robot-tests/tests \

  -v $RESULT_FOLDER:/opt/robot-tests/results ${DOCKER_ROBOT_IMAGE}:${DOCKER_ROBOT_IMAGE_VERSION}  \

  --variable CAPIF_HOSTNAME:$CAPIF_HOSTNAME \

helm/scripts/remove_remote_users_by_prefix.sh

+1 −9
Original line number Diff line number Diff line
@@ -56,14 +56,6 @@ then 
    exit -1

fi



# Other Stuff

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

DOCKER_ROBOT_IMAGE_VERSION=1.0



TEST_FOLDER=$CAPIF_BASE_DIR/tests

RESULT_FOLDER=$CAPIF_BASE_DIR/results

ROBOT_DOCKER_FILE_FOLDER=$CAPIF_BASE_DIR/tools/robot



# nginx Hostname and http port (80 by default) to reach for tests

CAPIF_REGISTER=$REGISTER_HOSTNAME

CAPIF_REGISTER_PORT=443
@@ -127,7 +119,7 @@ cd $CAPIF_BASE_DIR 


mkdir -p $RESULT_FOLDER



docker run -ti --rm --network="host" \

docker run $DOCKER_ROBOT_TTY_OPTIONS --rm --network="host" \

  -v $TEST_FOLDER:/opt/robot-tests/tests \

  -v $RESULT_FOLDER:/opt/robot-tests/results ${DOCKER_ROBOT_IMAGE}:${DOCKER_ROBOT_IMAGE_VERSION}  \

  --variable CAPIF_HOSTNAME:$CAPIF_HOSTNAME \