From 3479b03f8d405d8bee40937819902b0448ba62a3 Mon Sep 17 00:00:00 2001
From: Arthur Barr <arthur.barr@uk.ibm.com>
Date: Mon, 2 Oct 2017 09:08:47 +0100
Subject: [PATCH] Additional Helm tests

---
 test/kubernetes/helm_test.go      |  3 +++
 test/kubernetes/helm_test_util.go | 29 +++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/test/kubernetes/helm_test.go b/test/kubernetes/helm_test.go
index a90f45f..76c94f6 100644
--- a/test/kubernetes/helm_test.go
+++ b/test/kubernetes/helm_test.go
@@ -28,6 +28,9 @@ var namespace = "default"
 func TestHelmPredefinedVolume(t *testing.T) {
 	cs := kubeLogin(t)
 	release := strings.ToLower(t.Name())
+	if !volumesAvailable(t, cs) {
+		t.Skipf("Skipping test because no persistent volumes were found")
+	}
 	helmInstall(t, cs, release, "license=accept", "persistence.useDynamicProvisioning=false")
 	defer helmDelete(t, cs, release)
 	defer helmDeletePVC(t, cs, release)
diff --git a/test/kubernetes/helm_test_util.go b/test/kubernetes/helm_test_util.go
index 5c3658b..cdd7a72 100644
--- a/test/kubernetes/helm_test_util.go
+++ b/test/kubernetes/helm_test_util.go
@@ -32,6 +32,14 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 )
 
+func imageName() string {
+	image, ok := os.LookupEnv("TEST_IMAGE")
+	if !ok {
+		image = "ibmcom/mq"
+	}
+	return image
+}
+
 // runCommand runs an OS command.  On Linux it waits for the command to
 // complete and returns the exit status (return code).
 // TODO: duplicated from cmd/runmqserver/main.go
@@ -74,7 +82,7 @@ func inspectLogs(t *testing.T, cs *kubernetes.Clientset, release string) string
 func helmInstall(t *testing.T, cs *kubernetes.Clientset, release string, values ...string) {
 	chart := "../../charts/ibm-mqadvanced-server-prod"
 	//image := "mycluster.icp:8500/default/mq-devserver"
-	image := "ibmcom/mq"
+	//image := "ibmcom/mq"
 	tag := "latest"
 	arg := []string{
 		"install",
@@ -83,12 +91,13 @@ func helmInstall(t *testing.T, cs *kubernetes.Clientset, release string, values
 		"--name",
 		release,
 		"--set",
-		"image.repository=" + image,
+		"image.repository=" + imageName(),
 		"--set",
 		"image.tag=" + tag,
 		"--set",
 		"image.pullSecret=admin.registrykey",
 	}
+	// Add any extra values to the Helm command
 	for _, value := range values {
 		arg = append(arg, "--set", value)
 	}
@@ -212,4 +221,20 @@ func storageClassesDefined(t *testing.T, cs *kubernetes.Clientset) bool {
 	return false
 }
 
+// volumesAvailable checks to see if any persistent volumes are available.
+// On some Kubernetes clusters, only storage classes are used, so there won't
+// be any volumes pre-created.
+func volumesAvailable(t *testing.T, cs *kubernetes.Clientset) bool {
+	pvs, err := cs.CoreV1().PersistentVolumes().List(metav1.ListOptions{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	for _, pv := range pvs.Items {
+		if pv.Status.Phase == v1.VolumeAvailable {
+			return true
+		}
+	}
+	return false
+}
+
 // TODO: On Minikube, need to make sure Helm is initialized first