From: Mohamed Abukar Date: Thu, 26 Nov 2020 08:28:38 +0000 (+0200) Subject: Fix failing UT X-Git-Tag: 0.5.3~12 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=87c7347bb500ba795c156359e00fe620d4dd2f85;p=ric-plt%2Fappmgr.git Fix failing UT Change-Id: Id9e7a91af1351189152abd6500cc2a78330e7b90 Signed-off-by: Mohamed Abukar --- diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go index a972e75..3a35877 100755 --- a/pkg/helm/helm.go +++ b/pkg/helm/helm.go @@ -48,7 +48,7 @@ func GetHelmVersion() { var temp string temp = os.Getenv("HELMVERSION") if temp == "" { - temp = "HELMVERSION=v2.12.3" + temp = "v2.12.3" } appmgr.Logger.Info("Inside new Helm") temp = strings.TrimLeft(temp,"v") @@ -385,7 +385,6 @@ func (h *Helm) GetInstallArgs(x models.XappDescriptor, cmOverride bool) (args st args = fmt.Sprintf("%s --version=%s", args, x.HelmVersion) } - if cm.EnvHelmVersion == cm.HELM_VERSION_2 { if x.ReleaseName != "" { args = fmt.Sprintf("%s --name=%s", args, x.ReleaseName) @@ -418,7 +417,6 @@ func (h *Helm) GetInstallArgs(x models.XappDescriptor, cmOverride bool) (args st repoName = "helm-repo" } - if cm.EnvHelmVersion == cm.HELM_VERSION_3 { appmgr.Logger.Info ("GetInstallArgs last: Version 3") return fmt.Sprintf("install %s %s/%s %s",*x.XappName, repoName, *x.XappName, args)