From 7f965302ad10e7045a2fd2fbf8fdd6eb7935d85d Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Wed, 29 Apr 2020 17:50:25 +0800 Subject: [PATCH] env --- .../engine/kubernetes/KubernetesTestEngine.java | 1 + .../engine/kubernetes/crds/jmeter/JmeterSpec.java | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java b/backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java index cd23508f92..d40840e9ba 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java +++ b/backend/src/main/java/io/metersphere/engine/kubernetes/KubernetesTestEngine.java @@ -90,6 +90,7 @@ public class KubernetesTestEngine extends AbstractEngine { jmeter.setSpec(new JmeterSpec() {{ setReplicas(1); setImage(JMETER_IMAGE); + setEnv(context.getEnv()); }}); LogUtil.info("Load test started. " + context.getTestId()); kubernetesProvider.applyCustomResource(jmeter); diff --git a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterSpec.java b/backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterSpec.java index d2baaac44d..9ed26694e0 100644 --- a/backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterSpec.java +++ b/backend/src/main/java/io/metersphere/engine/kubernetes/crds/jmeter/JmeterSpec.java @@ -4,11 +4,15 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.fabric8.kubernetes.api.model.KubernetesResource; +import java.util.HashMap; +import java.util.Map; + @JsonDeserialize @JsonInclude(JsonInclude.Include.NON_EMPTY) public class JmeterSpec implements KubernetesResource { private int replicas = 1; private String image; + private Map env = new HashMap<>(); public int getReplicas() { return replicas; @@ -25,4 +29,12 @@ public class JmeterSpec implements KubernetesResource { public void setImage(String image) { this.image = image; } + + public Map getEnv() { + return env; + } + + public void setEnv(Map env) { + this.env = env; + } }