Build JMS tests from Makefile

test/docker/devconfig_test.go

@@ -29,6 +29,8 @@ import (
 	"github.com/docker/go-connections/nat"
 )
 
+// TestDevGoldenPath tests using the default values for the default developer config.
+// Note: This test requires a separate container image to be available for the JMS tests.
 func TestDevGoldenPath(t *testing.T) {
 	t.Parallel()
 	cli, err := client.NewEnvClient()
@@ -64,6 +66,8 @@ func TestDevGoldenPath(t *testing.T) {
 	stopContainer(t, cli, id)
 }
 
+// TestDevTLS tests the default developer config using the a custom TLS key store.
+// Note: This test requires a separate container image to be available for the JMS tests
 func TestDevTLS(t *testing.T) {
 	t.Parallel()
 	cli, err := client.NewEnvClient()

test/docker/devconfig_test_util.go

@@ -73,7 +73,7 @@ func runJMSTests(t *testing.T, cli *client.Client, ID string, tls bool) {
 			"MQ_PASSWORD=" + devAppPassword,
 			"MQ_CHANNEL=DEV.APP.SVRCONN",
 		},
-		Image: "msgtest",
+		Image: imageNameDevJMS(),
 	}
 	if tls {
 		t.Log("Using TLS from JMS client")

test/docker/docker_api_test_util.go

@@ -49,6 +49,14 @@ func imageName() string {
 	return image
 }
 
+func imageNameDevJMS() string {
+	image, ok := os.LookupEnv("DEV_JMS_IMAGE")
+	if !ok {
+		image = "mq-dev-jms-test"
+	}
+	return image
+}
+
 func coverage() bool {
 	cover := os.Getenv("TEST_COVER")
 	if cover == "true" || cover == "1" {