New test profile

[nonrtric.git] / test / common / helmmanager_api_functions.sh

diff --git a/test/common/helmmanager_api_functions.sh b/test/common/helmmanager_api_functions.sh
index 455387a..42d2bca 100644 (file)
--- a/test/common/helmmanager_api_functions.sh
+++ b/test/common/helmmanager_api_functions.sh
@@ -57,7 +57,7 @@ __HELMMANAGER_kube_scale_zero() {
 # Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
 # This function is called for prestarted apps not managed by the test script.
 __HELMMANAGER_kube_scale_zero_and_wait() {
-       __kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-helmmanagerservice
+       __kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-"$HELM_MANAGER_APP_NAME"
 }
 
 # Delete all kube resouces for the app
@@ -71,7 +71,7 @@ __HELMMANAGER_kube_delete_all() {
 # args: <log-dir> <file-prexix>
 __HELMMANAGER_store_docker_logs() {
        if [ $RUNMODE == "KUBE" ]; then
-               kubectl  logs -l "autotest=HELMMANAGER" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_helmmanager.log 2>&1
+               kubectl $KUBECONF  logs -l "autotest=HELMMANAGER" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_helmmanager.log 2>&1
        else
                docker logs $HELM_MANAGER_APP_NAME > $1$2_helmmanager.log 2>&1
        fi
@@ -196,7 +196,7 @@ start_helm_manager() {
                if [ $retcode_p -eq 0 ]; then
                        echo -e " Using existing $HELM_MANAGER_APP_NAME deployment and service"
                        echo " Setting $HELM_MANAGER_APP_NAME replicas=1"
-                       __kube_scale deployment $HELM_MANAGER_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+                       __kube_scale sts $HELM_MANAGER_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
                fi
 
                if [ $retcode_i -eq 0 ]; then
@@ -517,7 +517,7 @@ helm_manager_api_exec_add_repo() {
                        return 1
                fi
        else
-               retmsg=$(kubectl exec -it $HELM_MANAGER_APP_NAME -n $KUBE_NONRTRIC_NAMESPACE -- helm repo add $1 $2)
+               retmsg=$(kubectl $KUBECONF exec -it $HELM_MANAGER_APP_NAME -n $KUBE_NONRTRIC_NAMESPACE -- helm repo add $1 $2)
                retcode=$?
                if [ $retcode -ne 0 ]; then
                        __log_conf_fail_general " Cannot add repo to helm, return code: $retcode, msg: $retmsg"