From ad9a0e93cebc85e352321b325726946644f67ef0 Mon Sep 17 00:00:00 2001
From: Sawjan Gurung <saw.jan.grg3e@gmail.com>
Date: Fri, 12 Jan 2024 18:41:05 +0545
Subject: [PATCH] step to show ocis logs (#8191)

---
 .drone.star                        | 63 +++++++++++++++++++-----------
 tests/config/drone/run_k6_tests.sh |  7 ++++
 2 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/.drone.star b/.drone.star
index 9cd488611..bc6e810c6 100644
--- a/.drone.star
+++ b/.drone.star
@@ -2819,6 +2819,35 @@ def logRequests():
     }]
 
 def k6LoadTests(ctx):
+    ocis_remote_environment = {
+        "SSH_OCIS_REMOTE": {
+            "from_secret": "ssh_ocis_remote",
+        },
+        "SSH_OCIS_USERNAME": {
+            "from_secret": "ssh_ocis_user",
+        },
+        "SSH_OCIS_PASSWORD": {
+            "from_secret": "ssh_ocis_pass",
+        },
+        "TEST_SERVER_URL": {
+            "from_secret": "ssh_ocis_server_url",
+        },
+    }
+    k6_remote_environment = {
+        "SSH_K6_REMOTE": {
+            "from_secret": "ssh_k6_remote",
+        },
+        "SSH_K6_USERNAME": {
+            "from_secret": "ssh_k6_user",
+        },
+        "SSH_K6_PASSWORD": {
+            "from_secret": "ssh_k6_pass",
+        },
+    }
+    environment = {}
+    environment.update(ocis_remote_environment)
+    environment.update(k6_remote_environment)
+
     if "skip" in config["k6LoadTests"] and config["k6LoadTests"]["skip"]:
         return []
 
@@ -2835,35 +2864,23 @@ def k6LoadTests(ctx):
             {
                 "name": "k6-load-test",
                 "image": OC_CI_ALPINE,
-                "environment": {
-                    "SSH_OCIS_REMOTE": {
-                        "from_secret": "ssh_ocis_remote",
-                    },
-                    "SSH_OCIS_USERNAME": {
-                        "from_secret": "ssh_ocis_user",
-                    },
-                    "SSH_OCIS_PASSWORD": {
-                        "from_secret": "ssh_ocis_pass",
-                    },
-                    "TEST_SERVER_URL": {
-                        "from_secret": "ssh_ocis_server_url",
-                    },
-                    "SSH_K6_REMOTE": {
-                        "from_secret": "ssh_k6_remote",
-                    },
-                    "SSH_K6_USERNAME": {
-                        "from_secret": "ssh_k6_user",
-                    },
-                    "SSH_K6_PASSWORD": {
-                        "from_secret": "ssh_k6_pass",
-                    },
-                },
+                "environment": environment,
                 "commands": [
                     "curl -s -o run_k6_tests.sh %s" % script_link,
                     "apk add --no-cache openssh-client sshpass",
                     "sh %s/run_k6_tests.sh" % (dirs["base"]),
                 ],
             },
+            {
+                "name": "ocis-log",
+                "image": OC_CI_ALPINE,
+                "environment": ocis_remote_environment,
+                "commands": [
+                    "curl -s -o run_k6_tests.sh %s" % script_link,
+                    "apk add --no-cache openssh-client sshpass",
+                    "sh %s/run_k6_tests.sh --ocis-log" % (dirs["base"]),
+                ],
+            },
         ],
         "depends_on": [],
         "trigger": {
diff --git a/tests/config/drone/run_k6_tests.sh b/tests/config/drone/run_k6_tests.sh
index 2c57070c6..8887c3f58 100644
--- a/tests/config/drone/run_k6_tests.sh
+++ b/tests/config/drone/run_k6_tests.sh
@@ -1,5 +1,12 @@
 #!/bin/sh
 
+set -e
+
+if [ "$1" = "--ocis-log" ]; then
+    sshpass -p "$SSH_OCIS_PASSWORD" ssh -o StrictHostKeyChecking=no "$SSH_OCIS_USERNAME@$SSH_OCIS_REMOTE" "bash ~/scripts/ocis.sh log"
+    exit 0
+fi
+
 # start ocis server
 sshpass -p "$SSH_OCIS_PASSWORD" ssh -o StrictHostKeyChecking=no "$SSH_OCIS_USERNAME@$SSH_OCIS_REMOTE" \
     "OCIS_URL=${TEST_SERVER_URL} \