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) --- api4/apitestlib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'api4') diff --git a/api4/apitestlib.go b/api4/apitestlib.go index 54b142c4b..25d0ecc60 100644 --- a/api4/apitestlib.go +++ b/api4/apitestlib.go @@ -454,7 +454,7 @@ func (me *TestHelper) LinkUserToTeam(user *model.User, team *model.Team) { } 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