From b4930fb8e5c41b54272661426ec0633255089eb3 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Wed, 25 Oct 2017 18:41:16 +0200 Subject: [PLT-7726] adjustments for the mm-server jenkinsfile (#7688) --- api/apitestlib.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'api') diff --git a/api/apitestlib.go b/api/apitestlib.go index b43bb2886..17e2a6623 100644 --- a/api/apitestlib.go +++ b/api/apitestlib.go @@ -6,6 +6,7 @@ package api import ( "fmt" "net" + "os" "strings" "time" @@ -363,7 +364,7 @@ func (me *TestHelper) LoginSystemAdmin() { } func GenerateTestEmail() string { - if utils.Cfg.EmailSettings.SMTPServer != "dockerhost" { + if utils.Cfg.EmailSettings.SMTPServer != "dockerhost" && os.Getenv("CI_INBUCKET_PORT") == "" { return strings.ToLower("success+" + model.NewId() + "@simulator.amazonses.com") } return strings.ToLower(model.NewId() + "@dockerhost") -- cgit v1.2.3-1-g7c22