From 7c041a0f718619c467754641cc0ef0a21ddd3982 Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Mon, 22 Mar 2021 15:02:16 +0530
Subject: [PATCH] MM-34124: Enable race tests on master branch (#17192)

Automatic Merge
---
 .circleci/config.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b36f878627..6a56c850e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -220,6 +220,8 @@ jobs:
         type: string
       dbsource:
         type: string
+      racemode:
+        type: string
     steps:
       - attach_workspace:
           at: ~/mattermost
@@ -251,7 +253,7 @@ jobs:
               -v ~/mattermost:/mattermost \
               -w /mattermost/mattermost-server \
               mattermost/mattermost-build-server:20201119_golang-1.15.5 \
-              bash -c "ulimit -n 8096; make test-server BUILD_NUMBER=$CIRCLE_BRANCH-$CIRCLE_PREVIOUS_BUILD_NUM TESTFLAGS= TESTFLAGSEE=" \
+              bash -c "ulimit -n 8096; make test-server<< parameters.racemode >> BUILD_NUMBER=$CIRCLE_BRANCH-$CIRCLE_PREVIOUS_BUILD_NUM TESTFLAGS= TESTFLAGSEE=" \
               bash -c scripts/diff-email-templates.sh
           no_output_timeout: 1h
       - run:
@@ -470,6 +472,7 @@ workflows:
           name: test-mysql
           dbdriver: mysql
           dbsource: mmuser:mostest@tcp(mysql:3306)/mattermost_test?charset=utf8mb4,utf8&multiStatements=true
+          racemode: ""
           requires:
             - check-app-layers
             - check-store-layers
@@ -479,6 +482,7 @@ workflows:
           name: test-postgres
           dbdriver: postgres
           dbsource: postgres://mmuser:mostest@postgres:5432/mattermost_test?sslmode=disable&connect_timeout=10
+          racemode: ""
           requires:
             - check-app-layers
             - check-store-layers
@@ -536,6 +540,7 @@ workflows:
           name: test-mysql
           dbdriver: mysql
           dbsource: mmuser:mostest@tcp(mysql:3306)/mattermost_test?charset=utf8mb4,utf8&multiStatements=true
+          racemode: "-race"
           requires:
             - check-app-layers
             - check-store-layers
@@ -545,6 +550,7 @@ workflows:
           name: test-postgres
           dbdriver: postgres
           dbsource: postgres://mmuser:mostest@postgres:5432/mattermost_test?sslmode=disable&connect_timeout=10
+          racemode: "-race"
           requires:
             - check-app-layers
             - check-store-layers