diff options
| author |   rameshiyer27 <ramesh.murugan.iyer@est.tech> | 2024-06-13 13:52:16 +0000 |
|---|---|---|
| committer | rameshiyer27 <ramesh.murugan.iyer@est.tech> | 2024-06-13 16:19:28 +0000 |
| commit | 4f25dde65158bf67ce4ad02d2a9aa76c3d28f4b5 (patch) | |
| tree | dd7135a2e6c14a5873f1a2cc3054503f1c3aee16 /csit | |
| parent | 7bfa0fdd418317bbe90b569c7daa787f17e656bc (diff) | |
Add group id for operation topic
Group id added for operation topic config
Fix K8s test cases that were not invoked in clamp due to a missing env variable.
Issue-ID: POLICY-5031
Change-Id: I1b48509091717317a2e501cc1d19e4b9da69c5c8
Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech>
Diffstat (limited to 'csit')
| -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 | ||||
| -rwxr-xr-x | csit/run-project-csit.sh | 2 |
4 files changed, 4 insertions, 6 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} diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh index a7f7e865..678bfe2a 100755 --- a/csit/run-project-csit.sh +++ b/csit/run-project-csit.sh @@ -42,10 +42,10 @@ function docker_stats(){ function setup_clamp() { export ROBOT_FILES="policy-clamp-test.robot" + export TEST_ENV="docker" source "${WORKSPACE}"/compose/start-compose.sh policy-clamp-runtime-acm sleep 30 bash "${SCRIPTS}"/wait_for_rest.sh localhost "${ACM_PORT}" - export CLAMP_K8S_TEST=false } function setup_api() { |