From e94639e7f3d52a556fbf7e5a3c3a9c0e5f3941aa Mon Sep 17 00:00:00 2001
From: ypoplavs <45286051+ypoplavs@users.noreply.github.com>
Date: Fri, 15 Sep 2023 13:52:07 +0300
Subject: [PATCH] feat: added jmeterd (#631)

* added jmeterd
---
 .../helm-deploy-testkube-charts-develop.yaml  |  2 +-
 .../helm-deploy-testkube-charts-stage.yaml    |  2 +-
 charts/testkube-api/executors.json            | 40 +++++++++++++++++++
 scripts/chart_releaser.sh                     |  2 +-
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/helm-deploy-testkube-charts-develop.yaml b/.github/workflows/helm-deploy-testkube-charts-develop.yaml
index ddf2f2d18..8fec6f072 100644
--- a/.github/workflows/helm-deploy-testkube-charts-develop.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-develop.yaml
@@ -57,7 +57,7 @@ jobs:
           git pull origin develop
 
           export image_tag=${{ github.event.client_payload.image_tag_api }}
-          export executor_names="artillery curl cypress ginkgo gradle init jmeter k6 kubepug maven playwright postman scraper soapui tracetest zap"
+          export executor_names="artillery curl cypress ginkgo gradle init jmeter jmeterd k6 kubepug maven playwright postman scraper soapui tracetest zap"
           for executor_name in $executor_names; do
             sed -i "s/\(\"image\":.*$executor_name.*:\).*$/\1$image_tag\",/" ./charts/testkube-api/executors.json
           done
diff --git a/.github/workflows/helm-deploy-testkube-charts-stage.yaml b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
index 48ac25bf9..ae53c3802 100644
--- a/.github/workflows/helm-deploy-testkube-charts-stage.yaml
+++ b/.github/workflows/helm-deploy-testkube-charts-stage.yaml
@@ -58,7 +58,7 @@ jobs:
           git pull origin develop
 
           export image_tag=${{ github.event.client_payload.image_tag_api }}
-          export executor_names="artillery curl cypress ginkgo gradle init jmeter k6 kubepug maven playwright postman scraper soapui tracetest zap"
+          export executor_names="artillery curl cypress ginkgo gradle init jmeter jmeterd k6 kubepug maven playwright postman scraper soapui tracetest zap"
           for executor_name in $executor_names; do
             sed -i "s/\(\"image\":.*$executor_name.*:\).*$/\1$image_tag\",/" ./charts/testkube-api/executors.json
           done
diff --git a/charts/testkube-api/executors.json b/charts/testkube-api/executors.json
index ce9f2043c..1aff75701 100644
--- a/charts/testkube-api/executors.json
+++ b/charts/testkube-api/executors.json
@@ -134,6 +134,46 @@
             }
         }
     },
+    {
+        "name": "jmeterd-executor",
+        "executor": {
+            "executorType": "job",
+            "image": "kubeshop/testkube-jmeterd-executor:2f2a937",
+            "command": [
+                "<entryPoint>"
+            ],
+            "args": [
+                "-n",
+                "-j",
+                "<logFile>",
+                "-t",
+                "<runPath>",
+                "-l",
+                "<jtlFile>",
+                "-e",
+                "-o",
+                "<reportFile>",
+                "<envVars>"
+            ],
+            "types": [
+                "jmeterd/test"
+            ],
+            "contentTypes": [
+                "string",
+                "file-uri",
+                "git-file",
+                "git-dir",
+                "git"
+            ],
+            "features": [
+                "artifacts"
+            ],
+            "meta": {
+                "iconURI": "jmeter",
+                "docsURI": "https://kubeshop.github.io/testkube/test-types/executor-jmeter"
+            }
+        }
+    },
     {
         "name": "ginkgo-executor",
         "executor": {
diff --git a/scripts/chart_releaser.sh b/scripts/chart_releaser.sh
index 1b53ee356..c0a705400 100755
--- a/scripts/chart_releaser.sh
+++ b/scripts/chart_releaser.sh
@@ -75,7 +75,7 @@ then
 
 else
     echo "Executors will be updated"
-    executor_name="artillery curl cypress ginkgo gradle init jmeter k6 kubepug maven playwright postman scraper soapui tracetest zap"
+    executor_name="artillery curl cypress ginkgo gradle init jmeter jmeterd k6 kubepug maven playwright postman scraper soapui tracetest zap"
     for executor in $executor_name; do
       sed -i "s/\(.*\"image\":.*$executor.*\:\).*$/\1$VERSION_FULL\",/g" ../charts/testkube-api/executors.json
       echo -e "\nChecking if TestKube's executors.json $executor executor has been updated:\n"