From 3e6ea4faeda05f028889a9ef24860c1ff34bb795 Mon Sep 17 00:00:00 2001
From: Viktor Scharf <scharf.vi@gmail.com>
Date: Wed, 9 Oct 2024 11:20:05 +0200
Subject: [PATCH 1/2] trigger k6 test in CI

starlark formay fix

use secrets which enabled for pull requests

do not fail ocis-log and open-grafana-dashboard
---
 .drone.star | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/.drone.star b/.drone.star
index bcb31708e5c..575c4724603 100644
--- a/.drone.star
+++ b/.drone.star
@@ -354,8 +354,6 @@ def main(ctx):
         ),
     )
 
-    pipelines = pipelines + k6LoadTests(ctx)
-
     pipelineSanityChecks(ctx, pipelines)
     return pipelines
 
@@ -419,6 +417,9 @@ def testPipelines(ctx):
 
     pipelines += e2eTestPipeline(ctx)
 
+    if ("skip" not in config["k6LoadTests"] or not config["k6LoadTests"]["skip"]) and ("k6-test" in ctx.build.title.lower() or ctx.build.event == "cron"):
+        pipelines.append(k6LoadTests(ctx))
+
     return pipelines
 
 def getGoBinForTesting(ctx):
@@ -2973,27 +2974,27 @@ def logRequests():
 def k6LoadTests(ctx):
     ocis_remote_environment = {
         "SSH_OCIS_REMOTE": {
-            "from_secret": "ssh_ocis_remote",
+            "from_secret": "k6_ssh_ocis_remote",
         },
         "SSH_OCIS_USERNAME": {
-            "from_secret": "ssh_ocis_user",
+            "from_secret": "k6_ssh_ocis_user",
         },
         "SSH_OCIS_PASSWORD": {
-            "from_secret": "ssh_ocis_pass",
+            "from_secret": "k6_ssh_ocis_pass",
         },
         "TEST_SERVER_URL": {
-            "from_secret": "ssh_ocis_server_url",
+            "from_secret": "k6_ssh_ocis_server_url",
         },
     }
     k6_remote_environment = {
         "SSH_K6_REMOTE": {
-            "from_secret": "ssh_k6_remote",
+            "from_secret": "k6_ssh_k6_remote",
         },
         "SSH_K6_USERNAME": {
-            "from_secret": "ssh_k6_user",
+            "from_secret": "k6_ssh_k6_user",
         },
         "SSH_K6_PASSWORD": {
-            "from_secret": "ssh_k6_pass",
+            "from_secret": "k6_ssh_k6_pass",
         },
     }
     environment = {}
@@ -3005,6 +3006,12 @@ def k6LoadTests(ctx):
 
     ocis_git_base_url = "https://raw.githubusercontent.com/owncloud/ocis"
     script_link = "%s/%s/tests/config/drone/run_k6_tests.sh" % (ocis_git_base_url, ctx.build.commit)
+
+    event_array = ["cron"]
+
+    if "k6-test" in ctx.build.title.lower():
+        event_array.append("pull_request")
+
     return [{
         "kind": "pipeline",
         "type": "docker",
@@ -3032,6 +3039,12 @@ def k6LoadTests(ctx):
                     "apk add --no-cache openssh-client sshpass",
                     "sh %s/run_k6_tests.sh --ocis-log" % (dirs["base"]),
                 ],
+                "when": {
+                    "status": [
+                        "success",
+                        "failure",
+                    ],
+                },
             },
             {
                 "name": "open-grafana-dashboard",
@@ -3039,13 +3052,17 @@ def k6LoadTests(ctx):
                 "commands": [
                     "echo 'Grafana Dashboard: https://grafana.k6.infra.owncloud.works'",
                 ],
+                "when": {
+                    "status": [
+                        "success",
+                        "failure",
+                    ],
+                },
             },
         ],
         "depends_on": [],
         "trigger": {
-            "event": [
-                "cron",
-            ],
+            "event": event_array,
         },
     }]
 

From 7cc481ef9be21ba6fa356a71dcf90465e326484c Mon Sep 17 00:00:00 2001
From: Saw-jan <saw.jan.grg3e@gmail.com>
Date: Tue, 15 Oct 2024 16:09:02 +0545
Subject: [PATCH 2/2] ci: fix adding new pipeline

---
 .drone.star | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.star b/.drone.star
index 575c4724603..93a39e0e659 100644
--- a/.drone.star
+++ b/.drone.star
@@ -418,7 +418,7 @@ def testPipelines(ctx):
     pipelines += e2eTestPipeline(ctx)
 
     if ("skip" not in config["k6LoadTests"] or not config["k6LoadTests"]["skip"]) and ("k6-test" in ctx.build.title.lower() or ctx.build.event == "cron"):
-        pipelines.append(k6LoadTests(ctx))
+        pipelines += k6LoadTests(ctx)
 
     return pipelines