[PLT-7726] adjustments for the mm-server jenkinsfile (#7688)

2 files changed, 33 insertions, 6 deletions

diff --git a/utils/file_test.go b/utils/file_test.go
index 0ad02de7e..ed2e8683b 100644
--- a/utils/file_test.go
+++ b/utils/file_test.go
@@ -4,6 +4,8 @@
 package utils
 
 import (
+	"fmt"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -53,6 +55,17 @@ func (s *FileTestSuite) SetupTest() {
 	s.amazonS3SSL = *Cfg.FileSettings.AmazonS3SSL
 
 	// Set up the state for the tests.
+	s3Host := os.Getenv("CI_HOST")
+	if s3Host == "" {
+		s3Host = "dockerhost"
+	}
+
+	s3Port := os.Getenv("CI_MINIO_PORT")
+	if s3Port == "" {
+		s3Port = "9001"
+	}
+
+	s3Endpoint := fmt.Sprintf("%s:%s", s3Host, s3Port)
 	if s.testDriver == model.IMAGE_DRIVER_LOCAL {
 		*Cfg.FileSettings.DriverName = model.IMAGE_DRIVER_LOCAL
 	} else if s.testDriver == model.IMAGE_DRIVER_S3 {
@@ -60,7 +73,7 @@ func (s *FileTestSuite) SetupTest() {
 		Cfg.FileSettings.AmazonS3AccessKeyId = "minioaccesskey"
 		Cfg.FileSettings.AmazonS3SecretAccessKey = "miniosecretkey"
 		Cfg.FileSettings.AmazonS3Bucket = "mattermost-test"
-		Cfg.FileSettings.AmazonS3Endpoint = "dockerhost:9001"
+		Cfg.FileSettings.AmazonS3Endpoint = s3Endpoint
 		*Cfg.FileSettings.AmazonS3SSL = false
 	} else {
 		s.T().Fatal("Invalid image driver set for test suite.")
diff --git a/utils/inbucket.go b/utils/inbucket.go
index 53f6c759d..3aef34d9f 100644
--- a/utils/inbucket.go
+++ b/utils/inbucket.go
@@ -8,13 +8,13 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"strings"
 	"time"
 )
 
 const (
-	INBUCKET_HOST = "http://dockerhost:9000"
-	INBUCKET_API  = "/api/v1/mailbox/"
+	INBUCKET_API = "/api/v1/mailbox/"
 )
 
 // OutputJSONHeader holds the received Header to test sending emails (inbucket)
@@ -49,7 +49,7 @@ func GetMailBox(email string) (results JSONMessageHeaderInbucket, err error) {
 
 	parsedEmail := ParseEmail(email)
 
-	url := fmt.Sprintf("%s%s%s", INBUCKET_HOST, INBUCKET_API, parsedEmail)
+	url := fmt.Sprintf("%s%s%s", getInbucketHost(), INBUCKET_API, parsedEmail)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, err
@@ -88,7 +88,7 @@ func GetMessageFromMailbox(email, id string) (results JSONMessageInbucket, err e
 
 	var record JSONMessageInbucket
 
-	url := fmt.Sprintf("%s%s%s/%s", INBUCKET_HOST, INBUCKET_API, parsedEmail, id)
+	url := fmt.Sprintf("%s%s%s/%s", getInbucketHost(), INBUCKET_API, parsedEmail, id)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return record, err
@@ -112,7 +112,7 @@ func DeleteMailBox(email string) (err error) {
 
 	parsedEmail := ParseEmail(email)
 
-	url := fmt.Sprintf("%s%s%s", INBUCKET_HOST, INBUCKET_API, parsedEmail)
+	url := fmt.Sprintf("%s%s%s", getInbucketHost(), INBUCKET_API, parsedEmail)
 	req, err := http.NewRequest("DELETE", url, nil)
 	if err != nil {
 		return err
@@ -146,3 +146,17 @@ func RetryInbucket(attempts int, callback func() error) (err error) {
 	}
 	return fmt.Errorf("After %d attempts, last error: %s", attempts, err)
 }
+
+func getInbucketHost() (host string) {
+
+	inbucket_host := os.Getenv("CI_HOST")
+	if inbucket_host == "" {
+		inbucket_host = "dockerhost"
+	}
+
+	inbucket_port := os.Getenv("CI_INBUCKET_PORT")
+	if inbucket_port == "" {
+		inbucket_port = "9000"
+	}
+	return fmt.Sprintf("http://%s:%s", inbucket_host, inbucket_port)
+}