From bf03f391e635b0b9b129768cec5ea13c571744fa Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Mon, 20 Jul 2020 22:50:00 +0530 Subject: [PATCH] MM-27041: Do not run tests against both DBs in CI (#15060) * MM-27041: Do not run tests against both DBs in CI We already run the entire test suite for both mysql and postgres in parallel in CI. So we just run the tests for the current database set. * Fix incorrect env var --- store/sqlstore/store_test.go | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/store/sqlstore/store_test.go b/store/sqlstore/store_test.go index 8b141d2033..36679998dd 100644 --- a/store/sqlstore/store_test.go +++ b/store/sqlstore/store_test.go @@ -4,6 +4,7 @@ package sqlstore import ( + "os" "sync" "testing" @@ -80,14 +81,31 @@ func initStores() { if testing.Short() { return } - storeTypes = append(storeTypes, &storeType{ - Name: "MySQL", - SqlSettings: storetest.MakeSqlSettings(model.DATABASE_DRIVER_MYSQL), - }) - storeTypes = append(storeTypes, &storeType{ - Name: "PostgreSQL", - SqlSettings: storetest.MakeSqlSettings(model.DATABASE_DRIVER_POSTGRES), - }) + // In CI, we already run the entire test suite for both mysql and postgres in parallel. + // So we just run the tests for the current database set. + if os.Getenv("IS_CI") == "true" { + switch os.Getenv("MM_SQLSETTINGS_DRIVERNAME") { + case "mysql": + storeTypes = append(storeTypes, &storeType{ + Name: "MySQL", + SqlSettings: storetest.MakeSqlSettings(model.DATABASE_DRIVER_MYSQL), + }) + case "postgres": + storeTypes = append(storeTypes, &storeType{ + Name: "PostgreSQL", + SqlSettings: storetest.MakeSqlSettings(model.DATABASE_DRIVER_POSTGRES), + }) + } + } else { + storeTypes = append(storeTypes, &storeType{ + Name: "MySQL", + SqlSettings: storetest.MakeSqlSettings(model.DATABASE_DRIVER_MYSQL), + }) + storeTypes = append(storeTypes, &storeType{ + Name: "PostgreSQL", + SqlSettings: storetest.MakeSqlSettings(model.DATABASE_DRIVER_POSTGRES), + }) + } defer func() { if err := recover(); err != nil {