CLD-868: Create deployment function for K8s test framework (#148)

* added test util function for e2e tests

* changed folder same as pkg name for testUtil

Author: barkhachoithani

test/e2e/install_test.go

@@ -6,31 +6,26 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
-	"path/filepath"
 	"strings"
 	"testing"
 	"time"
 
-	"github.com/gruntwork-io/terratest/modules/helm"
 	http_helper "github.com/gruntwork-io/terratest/modules/http-helper"
 	"github.com/gruntwork-io/terratest/modules/k8s"
 	"github.com/gruntwork-io/terratest/modules/random"
+	"github.com/marklogic/marklogic-kubernetes/test/testUtil"
 	"github.com/stretchr/testify/assert"
 	"github.com/tidwall/gjson"
 	digestAuth "github.com/xinsnake/go-http-digest-auth-client"
 )
 
 func TestHelmInstall(t *testing.T) {
-	// Path to the helm chart we will test
-	helmChartPath, e := filepath.Abs("../../charts")
-	if e != nil {
-		t.Fatalf(e.Error())
-	}
-	imageRepo, repoPres := os.LookupEnv("dockerRepository")
-	imageTag, tagPres := os.LookupEnv("dockerVersion")
 	var resp *http.Response
 	var body []byte
 	var err error
+	var podName string
+	imageRepo, repoPres := os.LookupEnv("dockerRepository")
+	imageTag, tagPres := os.LookupEnv("dockerVersion")
 
 	if !repoPres {
 		imageRepo = "marklogic-centos/marklogic-server-centos"
@@ -42,31 +37,28 @@ func TestHelmInstall(t *testing.T) {
 		t.Logf("No imageTag variable present, setting to default value: " + imageTag)
 	}
 
+	options := map[string]string{
+		"persistence.enabled":   "false",
+		"replicaCount":          "2",
+		"image.repository":      imageRepo,
+		"image.tag":             imageTag,
+		"logCollection.enabled": "false",
+	}
+	t.Logf("====Installing Helm Chart")
+	releaseName := "test-install"
+
 	namespaceName := "marklogic-" + strings.ToLower(random.UniqueId())
 	kubectlOptions := k8s.NewKubectlOptions("", "", namespaceName)
-	options := &helm.Options{
-		KubectlOptions: kubectlOptions,
-		SetValues: map[string]string{
-			"persistence.enabled":   "false",
-			"replicaCount":          "2",
-			"image.repository":      imageRepo,
-			"image.tag":             imageTag,
-			"logCollection.enabled": "false",
-		},
-	}
 
 	t.Logf("====Creating namespace: " + namespaceName)
 	k8s.CreateNamespace(t, kubectlOptions, namespaceName)
 
 	defer t.Logf("====Deleting namespace: " + namespaceName)
 	defer k8s.DeleteNamespace(t, kubectlOptions, namespaceName)
 
-	t.Logf("====Installing Helm Chart")
-	releaseName := "test-install"
-	helm.Install(t, options, helmChartPath, releaseName)
+	podName = testUtil.HelmInstall(t, options, releaseName, kubectlOptions)
 
 	tlsConfig := tls.Config{}
-	podName := releaseName + "-marklogic-0"
 	// wait until the pod is in Ready status
 	k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 15*time.Second)
 	tunnel7997 := k8s.NewTunnel(kubectlOptions, k8s.ResourceTypePod, podName, 7997, 7997)

test/testUtil/helm_install.go

@@ -0,0 +1,33 @@
+// Package testUtil contains utility functions for all the tests in this repo
+package testUtil
+
+import (
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/gruntwork-io/terratest/modules/helm"
+	"github.com/gruntwork-io/terratest/modules/k8s"
+)
+
+// HelmInstall : testUtil function to install helm chart for e2e tests
+func HelmInstall(t *testing.T, options map[string]string, releaseName string, kubectlOpt *k8s.KubectlOptions) string {
+
+	// Path to the helm chart we will test
+	helmChartPath, e := filepath.Abs("../../charts")
+	if e != nil {
+		t.Fatalf(e.Error())
+	}
+
+	helmOptions := &helm.Options{
+		KubectlOptions: kubectlOpt,
+		SetValues:      options,
+	}
+
+	helm.Install(t, helmOptions, helmChartPath, releaseName)
+
+	podName := releaseName + "-marklogic-0"
+	// wait until the pod is in Ready status
+	k8s.WaitUntilPodAvailable(t, kubectlOpt, podName, 10, 15*time.Second)
+	return podName
+}