From 266abf9c5b847381d7fe45f80759c1531c257345 Mon Sep 17 00:00:00 2001 From: djklim87 Date: Thu, 16 Oct 2025 18:59:13 +0200 Subject: [PATCH 1/3] Feat: Bump CLT version --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 11be655..8d9645c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: push: false tags: manticoresoftware/manticore-dind:latest context: ./clt_tests/dind/ - - uses: manticoresoftware/clt@0.6.5 + - uses: manticoresoftware/clt@0.7.3 with: image: manticoresoftware/manticore-dind:latest test_prefix: clt_tests/tests/ From 22f583521eb9472ebd5c59125f9e151e0807b5ee Mon Sep 17 00:00:00 2001 From: djklim87 Date: Thu, 16 Oct 2025 19:01:38 +0200 Subject: [PATCH 2/3] Feat: Bump CLT version --- clt_tests/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clt_tests/readme.md b/clt_tests/readme.md index c78e59e..d578112 100644 --- a/clt_tests/readme.md +++ b/clt_tests/readme.md @@ -17,5 +17,5 @@ This command will help you launch and manage the Manticore image with the necess ```bash docker build -t manticoresoftware/manticore-dind:latest ./clt_tests/dind/ -RUN_ARGS="-v $(pwd):/docker --privileged" clt test -d -t ./clt_tests/tests/simple.rec manticoresoftware/manticore-dind:latest +CLT_RUN_ARGS="-v $(pwd):/docker --privileged" clt test -d -t ./clt_tests/tests/simple.rec manticoresoftware/manticore-dind:latest ``` From d66ee07f945084c6b0e55a140364b6fb7160091d Mon Sep 17 00:00:00 2001 From: djklim87 Date: Thu, 16 Oct 2025 22:20:10 +0200 Subject: [PATCH 3/3] Feat: Fix CLT tests --- .../config-flexible-with-custom-conf.rec | 20 ++++++------ .../config-flexible-with-default-conf.rec | 18 +++++------ clt_tests/tests/plain-indexes-desired.rec | 4 +-- clt_tests/tests/test-backup-restore.rec | 14 ++++---- clt_tests/tests/test-one-liner.rec | 32 +++++++++---------- clt_tests/tests/test-postgres-docker.rec | 6 ++-- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/clt_tests/tests/config-flexible-with-custom-conf.rec b/clt_tests/tests/config-flexible-with-custom-conf.rec index 0c6dae4..b98ef86 100644 --- a/clt_tests/tests/config-flexible-with-custom-conf.rec +++ b/clt_tests/tests/config-flexible-with-custom-conf.rec @@ -14,15 +14,15 @@ accepting connections ––– input ––– docker exec manticore cat /etc/manticoresearch/manticore.conf.debug | sort ––– output ––– -data_dir = /var/lib/manticore -listen = /var/run/mysqld/mysqld.sock:mysql41 -listen = 0.0.0.0:9308:http -listen = 172.18.0.2:9315-9325:replication -listen = 9306:mysql41 -listen = 9312 -log = /var/log/manticore/searchd.log -max_packet_size = 128M -pid_file = /var/run/manticore/searchd.pid -query_log_format = sphinxql + data_dir = /var/lib/manticore + listen = /var/run/mysqld/mysqld.sock:mysql41 + listen = 0.0.0.0:9308:http + listen = 172.18.0.2:9315-9325:replication + listen = 9306:mysql41 + listen = 9312 + log = /var/log/manticore/searchd.log + max_packet_size = 128M + pid_file = /var/run/manticore/searchd.pid + query_log_format = sphinxql searchd { } \ No newline at end of file diff --git a/clt_tests/tests/config-flexible-with-default-conf.rec b/clt_tests/tests/config-flexible-with-default-conf.rec index 021be92..9849712 100644 --- a/clt_tests/tests/config-flexible-with-default-conf.rec +++ b/clt_tests/tests/config-flexible-with-default-conf.rec @@ -10,15 +10,15 @@ accepting connections ––– input ––– docker exec manticore cat /etc/manticoresearch/manticore.conf.debug | sort ––– output ––– -data_dir = /var/lib/manticore -lemmatizer_base = /usr/share/manticore/ -listen = /var/run/mysqld/mysqld.sock:mysql41 -listen = 172.18.0.2:9312 -listen = 172.18.0.2:9315-9325:replication -listen = 9306:mysql41 -listen = 9308:http -max_packet_size = 64m -pid_file = /var/run/manticore/searchd.pid + data_dir = /var/lib/manticore + lemmatizer_base = /usr/share/manticore/ + listen = /var/run/mysqld/mysqld.sock:mysql41 + listen = 172.18.0.2:9312 + listen = 172.18.0.2:9315-9325:replication + listen = 9306:mysql41 + listen = 9308:http + max_packet_size = 64m + pid_file = /run/manticore/searchd.pid common { searchd { } diff --git a/clt_tests/tests/plain-indexes-desired.rec b/clt_tests/tests/plain-indexes-desired.rec index bbd665e..464775f 100644 --- a/clt_tests/tests/plain-indexes-desired.rec +++ b/clt_tests/tests/plain-indexes-desired.rec @@ -12,10 +12,10 @@ docker exec manticore mysql -e "SHOW TABLES\G;" ––– output ––– *************************** 1. row *************************** Table: idx1 -Type: local + Type: local *************************** 2. row *************************** Table: idx2 -Type: local + Type: local ––– input ––– docker exec manticore mysql -e "SELECT * FROM idx1\G;" ––– output ––– diff --git a/clt_tests/tests/test-backup-restore.rec b/clt_tests/tests/test-backup-restore.rec index c8ad4c9..a9f688a 100644 --- a/clt_tests/tests/test-backup-restore.rec +++ b/clt_tests/tests/test-backup-restore.rec @@ -90,15 +90,15 @@ Manticore config file: /etc/manticoresearch/manticore.conf.sh Tables to backup: all tables Backup dir: /tmp Manticore config -endpoint = http://127.0.0.1:9308 + endpoint = http://127.0.0.1:9308 Manticore config -endpoint = http://127.0.0.1:9312 + endpoint = http://127.0.0.1:9312 Manticore versions: -manticore: %{SEMVER} %{COMMITDATE}#!/(\s*dev)*/!# -columnar: %{SEMVER} %{COMMITDATE} -secondary: %{SEMVER} %{COMMITDATE} -knn: %{SEMVER} %{COMMITDATE} -buddy: %{SEMVER_EXT} + manticore: %{SEMVER} %{COMMITDATE}#!/(\s*dev)*/!# + columnar: %{SEMVER} %{COMMITDATE} + secondary: %{SEMVER} %{COMMITDATE} + knn: %{SEMVER} %{COMMITDATE} + buddy: %{SEMVER_EXT} %{DATETIME} [Info] Starting the backup... %{DATETIME} [Info] Backing up config files... %{DATETIME} [Info] config files - OK diff --git a/clt_tests/tests/test-one-liner.rec b/clt_tests/tests/test-one-liner.rec index 306c8e2..0fcb992 100644 --- a/clt_tests/tests/test-one-liner.rec +++ b/clt_tests/tests/test-one-liner.rec @@ -13,28 +13,28 @@ docker exec manticore mysql -e "SHOW TABLES\G" ––– output ––– *************************** 1. row *************************** Table: films -Type: rt + Type: rt ––– input ––– docker exec manticore mysql -e "SELECT * FROM films LIMIT 3\G" ––– output ––– *************************** 1. row *************************** -id: 19 -title: AMADEUS HOLY -description: A Emotional Display of a Pioneer And a Technical Writer who must Battle a Man in A Baloon -category_id: 1 + id: 19 + title: AMADEUS HOLY + description: A Emotional Display of a Pioneer And a Technical Writer who must Battle a Man in A Baloon + category_id: 1 release_year: 2008 -rental_rate: 0.990000 + rental_rate: 0.990000 *************************** 2. row *************************** -id: 21 -title: AMERICAN CIRCUS -description: A Insightful Drama of a Girl And a Astronaut who must Face a Database Administrator in A Shark Tank -category_id: 1 + id: 21 + title: AMERICAN CIRCUS + description: A Insightful Drama of a Girl And a Astronaut who must Face a Database Administrator in A Shark Tank + category_id: 1 release_year: 2009 -rental_rate: 4.990000 + rental_rate: 4.990000 *************************** 3. row *************************** -id: 29 -title: ANTITRUST TOMATOES -description: A Fateful Yarn of a Womanizer And a Feminist who must Succumb a Database Administrator in Ancient India -category_id: 1 + id: 29 + title: ANTITRUST TOMATOES + description: A Fateful Yarn of a Womanizer And a Feminist who must Succumb a Database Administrator in Ancient India + category_id: 1 release_year: 2005 -rental_rate: 2.990000 + rental_rate: 2.990000 diff --git a/clt_tests/tests/test-postgres-docker.rec b/clt_tests/tests/test-postgres-docker.rec index 715e00f..d81fabc 100644 --- a/clt_tests/tests/test-postgres-docker.rec +++ b/clt_tests/tests/test-postgres-docker.rec @@ -25,13 +25,13 @@ docker exec manticore mysql -h0 -P9306 -e "SHOW TABLES\G;" ––– output ––– *************************** 1. row *************************** Table: text_idx -Type: local + Type: local ––– input ––– docker exec manticore mysql -h0 -P9306 -e "SELECT * FROM text_idx\G;" ––– output ––– *************************** 1. row *************************** -id: 1 + id: 1 name: Element 1 *************************** 2. row *************************** -id: 2 + id: 2 name: Element 2