From aa432fe95a9e204dda836c5449223e196c784cb4 Mon Sep 17 00:00:00 2001
From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com>
Date: Mon, 17 Oct 2022 15:20:20 +0000
Subject: [PATCH] staging

---
 .github/workflows/pull_request.yml | 20 ++++++++++----------
 docker/test/sqlancer/run.sh        |  4 ++--
 tests/ci/sqlancer_check.py         |  2 ++
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 5b1011019f6..6335ccc9a35 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -3490,16 +3490,6 @@ jobs:
           docker ps --quiet | xargs --no-run-if-empty docker kill ||:
           docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
           sudo rm -fr "$TEMP_PATH"
-#############################################################################################
-###################################### JEPSEN TESTS #########################################
-#############################################################################################
-  Jepsen:
-    # This is special test NOT INCLUDED in FinishCheck
-    # When it's skipped, all dependent tasks will be skipped too.
-    # DO NOT add it there
-    if: contains(github.event.pull_request.labels.*.name, 'jepsen-test')
-    needs: [BuilderBinRelease]
-    uses: ./.github/workflows/jepsen.yml
 ##############################################################################################
 ###################################### SQLANCER FUZZERS ######################################
 ##############################################################################################
@@ -3537,6 +3527,16 @@ jobs:
           docker ps --quiet | xargs --no-run-if-empty docker kill ||:
           docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
           sudo rm -fr "$TEMP_PATH"
+#############################################################################################
+###################################### JEPSEN TESTS #########################################
+#############################################################################################
+  Jepsen:
+    # This is special test NOT INCLUDED in FinishCheck
+    # When it's skipped, all dependent tasks will be skipped too.
+    # DO NOT add it there
+    if: contains(github.event.pull_request.labels.*.name, 'jepsen-test')
+    needs: [BuilderBinRelease]
+    uses: ./.github/workflows/jepsen.yml
   FinishCheck:
     needs:
       - StyleCheck
diff --git a/docker/test/sqlancer/run.sh b/docker/test/sqlancer/run.sh
index 7e35b6073ae..3a8c43cdfd4 100755
--- a/docker/test/sqlancer/run.sh
+++ b/docker/test/sqlancer/run.sh
@@ -31,7 +31,7 @@ fi
 
 /clickhouse server -P /clickhouse-server.pid -L /clickhouse-server.log -E /clickhouse-server.log.err --daemon
 
-for i in `seq 1 30`; do if [[ `wget -q 'localhost:8123' -O-` == 'Ok.' ]]; then break ; else sleep 1; fi ; done
+for i in $(seq 1 30); do if [[ $(wget -q 'localhost:8123' -O-) == 'Ok.' ]]; then break ; else sleep 1; fi ; done
 
 cd /sqlancer/sqlancer-master
 
@@ -47,7 +47,7 @@ export NUM_QUERIES=1000
 
 pkill -F /clickhouse-server.pid
 
-for i in `seq 1 30`; do if [[ `wget -q 'localhost:8123' -O-` == 'Ok.' ]]; then sleep 1 ; else break; fi ; done
+for i in $(seq 1 30); do if [[ $(wget -q 'localhost:8123' -O-) == 'Ok.' ]]; then sleep 1 ; else break; fi ; done
 
 ls /var/log/clickhouse-server/
 tar czf /workplace/logs.tar.gz -C /var/log/clickhouse-server/ .
diff --git a/tests/ci/sqlancer_check.py b/tests/ci/sqlancer_check.py
index 5e6a8629a45..55660e4877b 100644
--- a/tests/ci/sqlancer_check.py
+++ b/tests/ci/sqlancer_check.py
@@ -162,6 +162,8 @@ if __name__ == "__main__":
     # if "fail" in status:
     #     test_result = [(description, "FAIL")]
     # else:
+    status = "success"
+    description = "SQLancer runs in always green mode for now"
     test_result = [(check_name, "OK")]
 
     ch_helper = ClickHouseHelper()