diff options
Diffstat (limited to 'robot')
| -rw-r--r-- | robot/assets/dcae/hvves_test_config.yaml | 2 | ||||
| -rw-r--r-- | robot/resources/chart_museum.robot | 10 | ||||
| -rw-r--r-- | robot/resources/dcaemod_interface.robot | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/robot/assets/dcae/hvves_test_config.yaml b/robot/assets/dcae/hvves_test_config.yaml index bd86c1be..4b5c0104 100644 --- a/robot/assets/dcae/hvves_test_config.yaml +++ b/robot/assets/dcae/hvves_test_config.yaml @@ -6,7 +6,7 @@ data: security.keys.keyStorePasswordFile: /dev/null security.keys.trustStoreFile: /tmp/ca.p12 security.keys.trustStorePasswordFile: /dev/null - security.sslDisable: false + security.sslDisable: true server.idleTimeoutSec: 300 server.listenPort: 6061 streams_publishes: 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 |