diff --git a/test/Dockerfile b/test/Dockerfile index 41d53e97bb44288b9f9c74fa300905af3c23e2b5..25c14c9b0e63f7a24d2dda85177f08fac6f4ffe9 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -1,12 +1,13 @@ # Dockerfile for snf-occi-manual-ci # contains functional testing scripts # -# VERSION 0.2 +# VERSION 0.3 FROM egifedcloud/fedcloud-userinterface:latest MAINTAINER Stavros Sachtouris <saxtouri@grnet.gr> -RUN apt update && apt install ca-policy-egi-core -y +RUN apt update && apt install ca-policy-egi-core curl -y COPY run_functional_tests.sh /data/ +COPY run_curl_tests.sh /data/ COPY run.sh /data/ CMD ["/bin/bash", "/data/run.sh"] diff --git a/test/README.md b/test/README.md index 87c512ad5655aac325ea5342da1eb4cf77e25ee3..428e1c3095cb54893665bbf18be88694493758a1 100644 --- a/test/README.md +++ b/test/README.md @@ -35,10 +35,10 @@ If you already have a valid proxy, load it somewhere on the machine What is in the container ------------------------ You will find all the tools from egifedcloud/fedcloud-userinterface:latest plus -a shell script to test the snf-occi application. +two shell script to test the snf-occi application. -To run the script, you must set some variables, either when you RUN the -container or while you are inside the container. +To run the "run_functional_tests.sh" script, you must set some variables, +either when you RUN the container or while you are inside the container. :: @@ -47,12 +47,22 @@ container or while you are inside the container. OS_TPL RESOURCE_TPL +For the "run_curl_tests.sh" you need a similar set of enviroment variables. + +:: + + OCCI_ENDPOINT + TOKEN + OS_TPL + RESOURCE_TPL + For instance, if you have a proxy, you may want to run something like: :: $ docker run -v my_proxy:/data/my_proxy \ -e OCCI_ENDPOINT="https://okeanos-occi2.hellasgrid.gr:9000" \ + -e TOKEN="My-Okeanos-Token" -e USER_PROXY="/data/my_proxy" \ -e OS_TPL="6f1f7205-cf4c-4b8c-ae77-7c419747bcbd"\ -e RESOURCE_TPL="13"\