diff options
Diffstat (limited to 'csit/resources')
| -rw-r--r-- | csit/resources/Dockerfile | 2 | ||||
| -rwxr-xr-x | csit/resources/scripts/run-test.sh | 3 | ||||
| -rw-r--r-- | csit/resources/tests/policy-clamp-test.robot | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/csit/resources/Dockerfile b/csit/resources/Dockerfile index 786293d3..b0f41b6a 100644 --- a/csit/resources/Dockerfile +++ b/csit/resources/Dockerfile @@ -1,7 +1,7 @@ FROM nexus3.onap.org:10001/library/python:3.10-slim-bullseye ARG CSIT_SCRIPT=${CSIT_SCRIPT} ARG ROBOT_FILE=${ROBOT_FILE} -ENV ROBOT_WORKSPACE=/opt/robotworkspace ROBOT_FILE=$ROBOT_FILE CLAMP_K8S_TEST=$CLAMP_K8S_TEST +ENV ROBOT_WORKSPACE=/opt/robotworkspace ROBOT_FILE=$ROBOT_FILE TEST_ENV=$TEST_ENV RUN python3 -m pip -qq install --upgrade pip && \ python3 -m pip -qq install --upgrade --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" 'robotframework-onap==0.6.0.*' --pre && \ python3 -m pip -qq install --upgrade confluent-kafka && \ diff --git a/csit/resources/scripts/run-test.sh b/csit/resources/scripts/run-test.sh index 9b01d352..fb7d30bb 100755 --- a/csit/resources/scripts/run-test.sh +++ b/csit/resources/scripts/run-test.sh @@ -23,7 +23,6 @@ echo "Invoking the robot tests from: ${ROBOT_FILE}" DEFAULT_PORT=6969 DATA=/opt/robotworkspace/models/models-examples/src/main/resources/policies NODETEMPLATES=/opt/robotworkspace/models/models-examples/src/main/resources/nodetemplates -CLAMP_K8S_TEST=${K8S_TEST} POLICY_API_IP=policy-api:${DEFAULT_PORT} @@ -64,7 +63,7 @@ ROBOT_VARIABLES="-v DATA:${DATA} -v DROOLS_IP_2:${DROOLS_IP_2} -v TEMP_FOLDER:${DIST_TEMP_FOLDER} -v DISTRIBUTION_IP:${DISTRIBUTION_IP} --v CLAMP_K8S_TEST:${CLAMP_K8S_TEST}" +-v TEST_ENV:${TEST_ENV}" export ROBOT_VARIABLES diff --git a/csit/resources/tests/policy-clamp-test.robot b/csit/resources/tests/policy-clamp-test.robot index eff970a6..ca7cf7d1 100644 --- a/csit/resources/tests/policy-clamp-test.robot +++ b/csit/resources/tests/policy-clamp-test.robot @@ -120,8 +120,7 @@ InstantiateAutomationComposition [Documentation] Instantiate automation composition. ${auth}= Create List runtimeUser zb!XztG34 Log Creating session http://${POLICY_RUNTIME_ACM_IP} - ${K8sEnabled}= Convert To Boolean ${CLAMP_K8S_TEST} - Run Keyword If '${K8sEnabled}'=='True' set Suite variable ${instantiationfile} AcK8s.json + Run Keyword If '${TEST_ENV}'=='k8s' set Suite variable ${instantiationfile} AcK8s.json ... ELSE set Suite variable ${instantiationfile} AcDocker.json ${postjson}= Get file ${CURDIR}/data/${instantiationfile} |