From a40763b9baf1b162e8e9671ac59f8b8e73be7228 Mon Sep 17 00:00:00 2001
From: Philip Stoev <pstoev@materialize.io>
Date: Thu, 17 Jun 2021 13:26:56 +0200
Subject: [PATCH] sqllogictest: Fix the Nightly SLT test

make a dedicated workflow in test/sqllogictest/mzcompose.yml
the way one existed for the sql-fast test
---
 ci/slt/pipeline.yml             |  3 ++-
 ci/slt/slt.sh                   | 12 ------------
 test/sqllogictest/mzcompose.yml | 13 +++++++++++--
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ci/slt/pipeline.yml b/ci/slt/pipeline.yml
index 3f1e2d9889feb..2d296d8a44a44 100644
--- a/ci/slt/pipeline.yml
+++ b/ci/slt/pipeline.yml
@@ -8,7 +8,8 @@
 # by the Apache License, Version 2.0.
 
 steps:
-  - command: ci/slt/slt.sh
+  - id: sqllogictest
+    label: ":bulb: SQL logic tests"
     timeout_in_minutes: 300
     artifact_paths: target/slt-summary.json
     plugins:
diff --git a/ci/slt/slt.sh b/ci/slt/slt.sh
index 24c41fb905d15..167f414fdabeb 100755
--- a/ci/slt/slt.sh
+++ b/ci/slt/slt.sh
@@ -13,18 +13,6 @@
 
 set -euo pipefail
 
-. misc/shlib/shlib.bash
-
-if [[ ! "${BUILDKITE-}" ]]; then
-    sqllogictest() {
-        cargo run --release --bin sqllogictest -- "$@"
-    }
-fi
-
-if [[ "${BUILDKITE-}" ]]; then
-    await_postgres -h postgres -p 5432
-fi
-
 export RUST_BACKTRACE=full
 
 mkdir -p target
diff --git a/test/sqllogictest/mzcompose.yml b/test/sqllogictest/mzcompose.yml
index 23d5b827e5236..17bbc9b9467a1 100644
--- a/test/sqllogictest/mzcompose.yml
+++ b/test/sqllogictest/mzcompose.yml
@@ -18,6 +18,17 @@ mzworkflows:
         dbname: postgres
       - step: run
         service: sqllogictest-svc
+        entrypoint: ci/test/slt-fast.sh
+
+  sqllogictest:
+    steps:
+      - step: start-services
+        services: [postgres]
+      - step: wait-for-postgres
+        dbname: postgres
+      - step: run
+        service: sqllogictest-svc
+        entrypoint: ci/slt/slt.sh
 
 services:
   sqllogictest-svc:
@@ -31,8 +42,6 @@ services:
     - PGHOST=postgres
     - PGPASSWORD=postgres
     depends_on: [postgres]
-    entrypoint:
-    - ci/test/slt-fast.sh
   postgres:
     image: postgres:11.4
     ports: