From 2c958812d18cd467e12abfafbc52ee8001a0a4db Mon Sep 17 00:00:00 2001
From: Nitish Tiwari <tiwari.nitish@gmail.com>
Date: Sun, 14 May 2023 09:47:38 +0530
Subject: [PATCH 1/8] Fix order for tests

---
 docker-compose.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 76325b4ee..89ced9c93 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -51,7 +51,8 @@ services:
       timeout: 20s
       retries: 5
     depends_on:
-      - minio
+      minio:
+        condition: service_healthy
     deploy:
       restart_policy:
         condition: on-failure
@@ -65,7 +66,7 @@ services:
       - parseable-internal
     depends_on:
       parseable: 
-        condition: service_started
+        condition: service_healthy
     deploy:
       restart_policy:
         condition: on-failure
@@ -79,9 +80,9 @@ services:
       - parseable-internal
     depends_on:
       parseable: 
-        condition: service_started
+        condition: service_healthy
       quest-smoke: 
-        condition: service_started
+        condition: service_completed_successfully
     deploy:
       restart_policy:
         condition: on-failure

From a9e7d78eb0622a3e798e8175922f694df720a5c1 Mon Sep 17 00:00:00 2001
From: Nitish Tiwari <tiwari.nitish@gmail.com>
Date: Sun, 14 May 2023 10:13:01 +0530
Subject: [PATCH 2/8] Fixes

---
 docker-compose.yaml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 89ced9c93..14ce4521f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -20,9 +20,9 @@ services:
       - 9000
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
-      interval: 15s
+      interval: 20s
       timeout: 20s
-      retries: 5
+      retries: 10
     networks:
       - parseable-internal
 
@@ -52,12 +52,12 @@ services:
       retries: 5
     depends_on:
       minio:
-        condition: service_healthy
+        condition: service_started
     deploy:
       restart_policy:
         condition: on-failure
         delay: 20s
-        max_attempts: 3
+        max_attempts: 5
 
   quest-smoke:
     image: ghcr.io/parseablehq/quest:main
@@ -88,5 +88,3 @@ services:
         condition: on-failure
         delay: 20s
         max_attempts: 3
-        
-        

From 906a6f4be0aedb6e781cec40cc774743e3d7cde6 Mon Sep 17 00:00:00 2001
From: Nitish Tiwari <tiwari.nitish@gmail.com>
Date: Sun, 14 May 2023 12:57:23 +0530
Subject: [PATCH 3/8] Reorg files and separate load and smoke tests

---
 .../docker-compose-load.yaml                  | 28 ++------
 .github/docker-compose-smoke.yaml             | 72 +++++++++++++++++++
 .github/workflows/integration-test.yaml       |  2 +-
 .github/workflows/load-test.yaml              | 23 ++++++
 4 files changed, 101 insertions(+), 24 deletions(-)
 rename docker-compose.yaml => .github/docker-compose-load.yaml (73%)
 create mode 100644 .github/docker-compose-smoke.yaml
 create mode 100644 .github/workflows/load-test.yaml

diff --git a/docker-compose.yaml b/.github/docker-compose-load.yaml
similarity index 73%
rename from docker-compose.yaml
rename to .github/docker-compose-load.yaml
index 14ce4521f..3f959c59f 100644
--- a/docker-compose.yaml
+++ b/.github/docker-compose-load.yaml
@@ -20,9 +20,9 @@ services:
       - 9000
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
-      interval: 20s
+      interval: 15s
       timeout: 20s
-      retries: 10
+      retries: 5
     networks:
       - parseable-internal
 
@@ -51,38 +51,20 @@ services:
       timeout: 20s
       retries: 5
     depends_on:
-      minio:
-        condition: service_started
-    deploy:
-      restart_policy:
-        condition: on-failure
-        delay: 20s
-        max_attempts: 5
-
-  quest-smoke:
-    image: ghcr.io/parseablehq/quest:main
-    command: ["smoke", "http://parseable:8000", "parseableadmin", "parseableadmin"]
-    networks:
-      - parseable-internal
-    depends_on:
-      parseable: 
-        condition: service_healthy
+      - minio
     deploy:
       restart_policy:
         condition: on-failure
         delay: 20s
         max_attempts: 3
-        
+
   quest-load:
     image: ghcr.io/parseablehq/quest:main
     command: ["load", "http://parseable:8000", "parseableadmin", "parseableadmin", "20"]
     networks:
       - parseable-internal
     depends_on:
-      parseable: 
-        condition: service_healthy
-      quest-smoke: 
-        condition: service_completed_successfully
+      - parseable
     deploy:
       restart_policy:
         condition: on-failure
diff --git a/.github/docker-compose-smoke.yaml b/.github/docker-compose-smoke.yaml
new file mode 100644
index 000000000..8cd564e75
--- /dev/null
+++ b/.github/docker-compose-smoke.yaml
@@ -0,0 +1,72 @@
+version: "3.7"
+
+networks:
+  parseable-internal:
+
+services:
+  minio:
+    image: minio/minio:RELEASE.2023-02-10T18-48-39Z
+    entrypoint:
+      - sh
+      - -euc
+      - |
+        mkdir -p /tmp/minio/parseable && \
+        minio server /tmp/minio
+    environment:
+      - MINIO_ROOT_USER=parseable
+      - MINIO_ROOT_PASSWORD=supersecret
+      - MINIO_UPDATE=off
+    ports:
+      - 9000
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
+      interval: 15s
+      timeout: 20s
+      retries: 5
+    networks:
+      - parseable-internal
+
+  parseable:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    command: ["parseable", "s3-store"]
+    ports:
+      - 8000
+    environment:
+      - P_S3_URL=http://minio:9000
+      - P_S3_ACCESS_KEY=parseable
+      - P_S3_SECRET_KEY=supersecret
+      - P_S3_REGION=us-east-1
+      - P_S3_BUCKET=parseable
+      - P_STAGING_DIR=/tmp/data
+      - P_USERNAME=parseableadmin
+      - P_PASSWORD=parseableadmin
+      - P_CHECK_UPDATE=false
+    networks:
+      - parseable-internal
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:8000/api/v1/liveness" ]
+      interval: 15s
+      timeout: 20s
+      retries: 5
+    depends_on:
+      - minio
+    deploy:
+      restart_policy:
+        condition: on-failure
+        delay: 20s
+        max_attempts: 3
+
+  quest-smoke:
+    image: ghcr.io/parseablehq/quest:main
+    command: ["smoke", "http://parseable:8000", "parseableadmin", "parseableadmin"]
+    networks:
+      - parseable-internal
+    depends_on:
+      - parseable
+    deploy:
+      restart_policy:
+        condition: on-failure
+        delay: 20s
+        max_attempts: 3
diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
index f340f6e27..e87a4e2a4 100644
--- a/.github/workflows/integration-test.yaml
+++ b/.github/workflows/integration-test.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Start compose
-        run: docker-compose up --build --exit-code-from quest-load
+        run: docker-compose up -f ./github/docker-compose-smoke.yaml --build --exit-code-from quest-smoke
       - name: Stop compose
         if: always()
         run: docker-compose down
diff --git a/.github/workflows/load-test.yaml b/.github/workflows/load-test.yaml
new file mode 100644
index 000000000..3220845ac
--- /dev/null
+++ b/.github/workflows/load-test.yaml
@@ -0,0 +1,23 @@
+name: Load tests
+
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'helm/**'
+      - 'assets/**'
+      - '**.md'
+
+jobs:
+
+  docker-compose-test:
+    name: Docker Compose based load tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Start compose
+        run: docker-compose up -f ./github/docker-compose-load.yaml --build --exit-code-from quest-load
+      - name: Stop compose
+        if: always()
+        run: docker-compose down

From 6e4e8e1e5ce079233d5e2eb2a4ad26b936700bff Mon Sep 17 00:00:00 2001
From: Nitish Tiwari <tiwari.nitish@gmail.com>
Date: Sun, 14 May 2023 12:58:45 +0530
Subject: [PATCH 4/8] Fix paths

---
 .github/workflows/integration-test.yaml | 2 +-
 .github/workflows/load-test.yaml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
index e87a4e2a4..6646eb2b0 100644
--- a/.github/workflows/integration-test.yaml
+++ b/.github/workflows/integration-test.yaml
@@ -20,4 +20,4 @@ jobs:
         run: docker-compose up -f ./github/docker-compose-smoke.yaml --build --exit-code-from quest-smoke
       - name: Stop compose
         if: always()
-        run: docker-compose down
+        run: docker-compose down -f ./github/docker-compose-smoke.yaml
diff --git a/.github/workflows/load-test.yaml b/.github/workflows/load-test.yaml
index 3220845ac..df29cfa56 100644
--- a/.github/workflows/load-test.yaml
+++ b/.github/workflows/load-test.yaml
@@ -20,4 +20,4 @@ jobs:
         run: docker-compose up -f ./github/docker-compose-load.yaml --build --exit-code-from quest-load
       - name: Stop compose
         if: always()
-        run: docker-compose down
+        run: docker-compose down -f ./github/docker-compose-load.yaml

From c4ed43d679dfdfae3f1557adefd7f8a7a85413bf Mon Sep 17 00:00:00 2001
From: Nitish Tiwari <tiwari.nitish@gmail.com>
Date: Sun, 14 May 2023 13:01:55 +0530
Subject: [PATCH 5/8] Fix compose command

---
 .github/workflows/integration-test.yaml | 4 ++--
 .github/workflows/load-test.yaml        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
index 6646eb2b0..9d0f3bc45 100644
--- a/.github/workflows/integration-test.yaml
+++ b/.github/workflows/integration-test.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Start compose
-        run: docker-compose up -f ./github/docker-compose-smoke.yaml --build --exit-code-from quest-smoke
+        run: docker-compose -f ./github/docker-compose-smoke.yaml up --build --exit-code-from quest-smoke
       - name: Stop compose
         if: always()
-        run: docker-compose down -f ./github/docker-compose-smoke.yaml
+        run: docker-compose -f ./github/docker-compose-smoke.yaml down
diff --git a/.github/workflows/load-test.yaml b/.github/workflows/load-test.yaml
index df29cfa56..569cbb89f 100644
--- a/.github/workflows/load-test.yaml
+++ b/.github/workflows/load-test.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Start compose
-        run: docker-compose up -f ./github/docker-compose-load.yaml --build --exit-code-from quest-load
+        run: docker-compose -f ./github/docker-compose-load.yaml up --build --exit-code-from quest-load
       - name: Stop compose
         if: always()
-        run: docker-compose down -f ./github/docker-compose-load.yaml
+        run: docker-compose -f ./github/docker-compose-load.yaml down

From 1ea3578c5ace7c01da9423c865d17360e34c0506 Mon Sep 17 00:00:00 2001
From: Nitish Tiwari <tiwari.nitish@gmail.com>
Date: Sun, 14 May 2023 13:03:48 +0530
Subject: [PATCH 6/8] fix path

---
 .github/workflows/integration-test.yaml | 4 ++--
 .github/workflows/load-test.yaml        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
index 9d0f3bc45..18633492c 100644
--- a/.github/workflows/integration-test.yaml
+++ b/.github/workflows/integration-test.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Start compose
-        run: docker-compose -f ./github/docker-compose-smoke.yaml up --build --exit-code-from quest-smoke
+        run: docker-compose -f .github/docker-compose-smoke.yaml up --build --exit-code-from quest-smoke
       - name: Stop compose
         if: always()
-        run: docker-compose -f ./github/docker-compose-smoke.yaml down
+        run: docker-compose -f .github/docker-compose-smoke.yaml down
diff --git a/.github/workflows/load-test.yaml b/.github/workflows/load-test.yaml
index 569cbb89f..49e647a59 100644
--- a/.github/workflows/load-test.yaml
+++ b/.github/workflows/load-test.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Start compose
-        run: docker-compose -f ./github/docker-compose-load.yaml up --build --exit-code-from quest-load
+        run: docker-compose -f .github/docker-compose-load.yaml up --build --exit-code-from quest-load
       - name: Stop compose
         if: always()
-        run: docker-compose -f ./github/docker-compose-load.yaml down
+        run: docker-compose -f .github/docker-compose-load.yaml down

From 39ecbf6627db3661c077b0c47ebe7998507b9891 Mon Sep 17 00:00:00 2001
From: Nitish Tiwari <tiwari.nitish@gmail.com>
Date: Sun, 14 May 2023 13:05:42 +0530
Subject: [PATCH 7/8] fix dockerfile path

---
 .github/docker-compose-load.yaml  | 2 +-
 .github/docker-compose-smoke.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/docker-compose-load.yaml b/.github/docker-compose-load.yaml
index 3f959c59f..8418d64e7 100644
--- a/.github/docker-compose-load.yaml
+++ b/.github/docker-compose-load.yaml
@@ -29,7 +29,7 @@ services:
   parseable:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: ../Dockerfile
     command: ["parseable", "s3-store"]
     ports:
       - 8000
diff --git a/.github/docker-compose-smoke.yaml b/.github/docker-compose-smoke.yaml
index 8cd564e75..fb9a9815a 100644
--- a/.github/docker-compose-smoke.yaml
+++ b/.github/docker-compose-smoke.yaml
@@ -29,7 +29,7 @@ services:
   parseable:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: ../Dockerfile
     command: ["parseable", "s3-store"]
     ports:
       - 8000

From 0e36a790ab964077daf8edb3060199019036cb79 Mon Sep 17 00:00:00 2001
From: Nitish Tiwari <tiwari.nitish@gmail.com>
Date: Sun, 14 May 2023 13:12:05 +0530
Subject: [PATCH 8/8] revert path

---
 .github/workflows/integration-test.yaml                       | 4 ++--
 .github/workflows/load-test.yaml                              | 4 ++--
 .../docker-compose-load.yaml => docker-compose-load-test.yaml | 2 +-
 ...ocker-compose-smoke.yaml => docker-compose-smoke-test.yaml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename .github/docker-compose-load.yaml => docker-compose-load-test.yaml (98%)
 rename .github/docker-compose-smoke.yaml => docker-compose-smoke-test.yaml (98%)

diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
index 18633492c..5fdf3052b 100644
--- a/.github/workflows/integration-test.yaml
+++ b/.github/workflows/integration-test.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Start compose
-        run: docker-compose -f .github/docker-compose-smoke.yaml up --build --exit-code-from quest-smoke
+        run: docker-compose -f docker-compose-smoke-test.yaml up --build --exit-code-from quest-smoke
       - name: Stop compose
         if: always()
-        run: docker-compose -f .github/docker-compose-smoke.yaml down
+        run: docker-compose -f docker-compose-smoke-test.yaml down
diff --git a/.github/workflows/load-test.yaml b/.github/workflows/load-test.yaml
index 49e647a59..4fe975e78 100644
--- a/.github/workflows/load-test.yaml
+++ b/.github/workflows/load-test.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Start compose
-        run: docker-compose -f .github/docker-compose-load.yaml up --build --exit-code-from quest-load
+        run: docker-compose -f docker-compose-load-test.yaml up --build --exit-code-from quest-load
       - name: Stop compose
         if: always()
-        run: docker-compose -f .github/docker-compose-load.yaml down
+        run: docker-compose -f docker-compose-load-test.yaml down
diff --git a/.github/docker-compose-load.yaml b/docker-compose-load-test.yaml
similarity index 98%
rename from .github/docker-compose-load.yaml
rename to docker-compose-load-test.yaml
index 8418d64e7..3f959c59f 100644
--- a/.github/docker-compose-load.yaml
+++ b/docker-compose-load-test.yaml
@@ -29,7 +29,7 @@ services:
   parseable:
     build:
       context: .
-      dockerfile: ../Dockerfile
+      dockerfile: Dockerfile
     command: ["parseable", "s3-store"]
     ports:
       - 8000
diff --git a/.github/docker-compose-smoke.yaml b/docker-compose-smoke-test.yaml
similarity index 98%
rename from .github/docker-compose-smoke.yaml
rename to docker-compose-smoke-test.yaml
index fb9a9815a..8cd564e75 100644
--- a/.github/docker-compose-smoke.yaml
+++ b/docker-compose-smoke-test.yaml
@@ -29,7 +29,7 @@ services:
   parseable:
     build:
       context: .
-      dockerfile: ../Dockerfile
+      dockerfile: Dockerfile
     command: ["parseable", "s3-store"]
     ports:
       - 8000