diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2017-10-25 18:41:16 +0200 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-10-25 09:41:16 -0700 |
| commit | b4930fb8e5c41b54272661426ec0633255089eb3 (patch) | |
| tree | 91f7f42d4e0008530b4a630eeeb2c9e5806f670f /api | |
| parent | 5dd4466ab32d55f1369ad6a30670b3559ff41e11 (diff) | |
| download | chat-b4930fb8e5c41b54272661426ec0633255089eb3.tar.gz chat-b4930fb8e5c41b54272661426ec0633255089eb3.tar.bz2 chat-b4930fb8e5c41b54272661426ec0633255089eb3.zip | |
[PLT-7726] adjustments for the mm-server jenkinsfile (#7688)
Diffstat (limited to 'api')
| -rw-r--r-- | api/apitestlib.go | 3 |
1 files changed, 2 insertions, 1 deletions
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") |