diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2022-11-10 10:51:08 +0100 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2022-11-10 10:51:08 +0100 |
| commit | c6e56f1fff7f154634242e3dd457b1e1d98083ed (patch) | |
| tree | 6f5157fc8dcd8783567e6d265f7e31bff1d74f56 /robot/resources | |
| parent | 1cd4fbaa8a0c43802828d97b1d2cfc567f82600c (diff) | |
[ROBOT] Fix HVVES and 5GBulkPM testcases
add missing onap namespace to helm and kubectl calls
Also fixed configuration for HVVES for Kohn release
Issue-ID: INT-2160
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I891376c1949ddc5dbdce77ef65ce1898cba26f90
Diffstat (limited to 'robot/resources')
| -rw-r--r-- | robot/resources/chart_museum.robot | 10 | ||||
| -rw-r--r-- | robot/resources/dcaemod_interface.robot | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/robot/resources/chart_museum.robot b/robot/resources/chart_museum.robot index 8969336e..75accc68 100644 --- a/robot/resources/chart_museum.robot +++ b/robot/resources/chart_museum.robot @@ -39,9 +39,9 @@ Package and add charts to repository Install helm charts - [Documentation] Install DCAE Servcie using helm charts - [Arguments] ${chart_repo_name} ${dcae_servcie_helm_charts} ${dcae_service_helm_name} ${wait_time}=6m0s ${set_values_override}=${EMPTY} - ${helm_install}= Set Variable helm install ${dcae_service_helm_name} ${chart_repo_name}/${dcae_servcie_helm_charts} --set global.repository=${registry_ovveride} ${set_values_override} --wait --timeout ${wait_time} + [Documentation] Install DCAE Service using helm charts + [Arguments] ${chart_repo_name} ${dcae_service_helm_charts} ${dcae_service_helm_name} ${wait_time}=6m0s ${set_values_override}=${EMPTY} + ${helm_install}= Set Variable helm -n onap install ${dcae_service_helm_name} ${chart_repo_name}/${dcae_service_helm_charts} --set global.repository=${registry_ovveride} ${set_values_override} --wait --timeout ${wait_time} ${helm_install_command_output} = Run And Return Rc And Output ${helm_install} Log ${helm_install_command_output[1]} Should Be Equal As Integers ${helm_install_command_output[0]} 0 @@ -54,7 +54,7 @@ Install helm charts from folder Log ${helm_dependency_update_output[1]} Should Be Equal As Integers ${helm_dependency_update_output[0]} 0 ${rest} ${dcae_servcie_helm_charts} = Split String From Right ${chart_folder} / 1 - ${helm_install}= Set Variable helm install ${dcae_service_helm_name} ${chart_folder} --set global.repository=${registry_ovveride} ${set_values_override} --wait --timeout ${wait_time} + ${helm_install}= Set Variable helm -n onap install ${dcae_service_helm_name} ${chart_folder} --set global.repository=${registry_ovveride} ${set_values_override} --wait --timeout ${wait_time} ${helm_install_command_output} = Run And Return Rc And Output ${helm_install} Log ${helm_install_command_output[1]} Should Be Equal As Integers ${helm_install_command_output[0]} 0 @@ -62,7 +62,7 @@ Install helm charts from folder Uninstall helm charts [Documentation] Uninstall DCAE Servcie using helm charts [Arguments] ${dcae_service_helm_name} - ${helm_uninstall}= Set Variable helm uninstall ${dcae_service_helm_name} --timeout 5m0s + ${helm_uninstall}= Set Variable helm -n onap uninstall ${dcae_service_helm_name} --timeout 5m0s ${helm_uninstall_command_output}= Run And Return Rc And Output ${helm_uninstall} Should Be Equal As Integers ${helm_uninstall_command_output[0]} 0 ${helm_check}= Set Variable kubectl get pods -n onap | grep ${dcae_service_helm_name} diff --git a/robot/resources/dcaemod_interface.robot b/robot/resources/dcaemod_interface.robot index 04aa6ae1..19720e80 100644 --- a/robot/resources/dcaemod_interface.robot +++ b/robot/resources/dcaemod_interface.robot @@ -227,12 +227,12 @@ Deploy Applictaion [Arguments] ${processGroupName} ${compSpecName} ${command_output} = Run And Return Rc And Output helm repo update Should Be Equal As Integers ${command_output[0]} 0 - ${helm_install}= Set Variable helm install ${ONAP_HELM_RELEASE}-${compSpecName} chart-museum/${compSpecName} --set global.repository=${registry_ovveride} + ${helm_install}= Set Variable helm -n onap install ${ONAP_HELM_RELEASE}-${compSpecName} chart-museum/${compSpecName} --set global.repository=${registry_ovveride} ${helm_install_command_output} = Run And Return Rc And Output ${helm_install} Log ${helm_install_command_output[1]} Should Be Equal As Integers ${helm_install_command_output[0]} 0 Set Test Variable ${IS_SERVICE_DEPLOYED} True - ${kubectl_patch}= Set Variable kubectl patch deployment ${ONAP_HELM_RELEASE}-${compSpecName} -p '{"spec":{"template":{"spec":{"containers":[{"name": "${compSpecName}","image":"docker.io/nginx:latest"}]}}}}' + ${kubectl_patch}= Set Variable kubectl -n onap patch deployment ${ONAP_HELM_RELEASE}-${compSpecName} -p '{"spec":{"template":{"spec":{"containers":[{"name": "${compSpecName}","image":"docker.io/nginx:latest"}]}}}}' ${kubectl_patch_command_output}= Run And Return Rc And Output ${kubectl_patch} Log ${kubectl_patch_command_output[1]} Should Be Equal As Integers ${kubectl_patch_command_output[0]} 0 |