From 321d5830951f6744b3a3f9c2344ba8d01e298627 Mon Sep 17 00:00:00 2001 From: Florent Poinsard <35779988+frouioui@users.noreply.github.com> Date: Mon, 16 Oct 2023 16:59:20 -0500 Subject: [PATCH] Revert "wip test pr perf" --- config/prod/config.yaml | 10 +++------- go/server/cron_handlers.go | 3 --- go/server/server.go | 18 +++++++++--------- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/config/prod/config.yaml b/config/prod/config.yaml index a6bce98dd..21c3c905e 100644 --- a/config/prod/config.yaml +++ b/config/prod/config.yaml @@ -1,12 +1,8 @@ exec-go-version: "1.21.3" -#web-cron-schedule: "@midnight" -#web-cron-schedule-pull-requests: "*/5 * * * *" -#web-cron-schedule-tags: "*/1 * * * *" - -web-cron-schedule: "1 1 1 1 1" -web-cron-schedule-pull-requests: "*/1 * * * *" -web-cron-schedule-tags: "1 1 1 1 1" +web-cron-schedule: "@midnight" +web-cron-schedule-pull-requests: "*/5 * * * *" +web-cron-schedule-tags: "*/1 * * * *" web-port: 8080 web-benchmark-config-path: ./config/benchmarks/ diff --git a/go/server/cron_handlers.go b/go/server/cron_handlers.go index e987b6763..2f0a5e266 100644 --- a/go/server/cron_handlers.go +++ b/go/server/cron_handlers.go @@ -206,9 +206,6 @@ func (s *Server) pullRequestsCronHandler() { } for _, prInfo := range prInfos { - if prInfo.Number != 14034 { - continue - } ref := prInfo.SHA previousGitRef := prInfo.Base pullNb := prInfo.Number diff --git a/go/server/server.go b/go/server/server.go index a252431de..b5c9d4460 100644 --- a/go/server/server.go +++ b/go/server/server.go @@ -169,16 +169,16 @@ func (s *Server) Init() error { } s.benchmarkConfig = map[string]benchmarkConfig{ - // "micro": {file: path.Join(s.benchmarkConfigPath, "micro.yaml"), v: viper.New(), skip: true}, + "micro": {file: path.Join(s.benchmarkConfigPath, "micro.yaml"), v: viper.New(), skip: true}, "oltp": {file: path.Join(s.benchmarkConfigPath, "oltp.yaml"), v: viper.New()}, - // "oltp-set": {file: path.Join(s.benchmarkConfigPath, "oltp-set.yaml"), v: viper.New()}, - // "oltp-readonly": {file: path.Join(s.benchmarkConfigPath, "oltp-readonly.yaml"), v: viper.New()}, - // - // // TODO: oltp-readonly-olap benchmarks are skipped for now as they fail very often due to - // // MySQL connections being dropped. This issue will be investigated soon. - // "oltp-readonly-olap": {file: path.Join(s.benchmarkConfigPath, "olap-readonly.yaml"), v: viper.New(), skip: true}, - // - // "tpcc": {file: path.Join(s.benchmarkConfigPath, "tpcc.yaml"), v: viper.New()}, + "oltp-set": {file: path.Join(s.benchmarkConfigPath, "oltp-set.yaml"), v: viper.New()}, + "oltp-readonly": {file: path.Join(s.benchmarkConfigPath, "oltp-readonly.yaml"), v: viper.New()}, + + // TODO: oltp-readonly-olap benchmarks are skipped for now as they fail very often due to + // MySQL connections being dropped. This issue will be investigated soon. + "oltp-readonly-olap": {file: path.Join(s.benchmarkConfigPath, "olap-readonly.yaml"), v: viper.New(), skip: true}, + + "tpcc": {file: path.Join(s.benchmarkConfigPath, "tpcc.yaml"), v: viper.New()}, } for configName, config := range s.benchmarkConfig { config.v.SetConfigFile(config.file)