From 3e0f1f63c5f36db7cebf0a18115644bf8b9a728d Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Thu, 17 Aug 2023 18:12:57 +0800
Subject: [PATCH] build: jmeter image

---
 Jenkinsfile                             | 6 +++---
 install.conf                            | 2 +-
 metersphere/conf/metersphere.properties | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 34752a2..ee4e7b9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -239,7 +239,7 @@ pipeline {
                         #修改安装参数
                         sed -i -e "s#MS_IMAGE_TAG=.*#MS_IMAGE_TAG=${RELEASE}#g" install.conf
                         sed -i -e "s#MS_IMAGE_PREFIX=.*#MS_IMAGE_PREFIX=${IMAGE_PREFIX}#g" install.conf
-                        sed -i -e "s#MS_JMETER_IMAGE=.*#MS_JMETER_IMAGE=\\\${MS_IMAGE_PREFIX}/jmeter-master:${JMETER_TAG}#g" install.conf
+                        sed -i -e "s#MS_JMETER_IMAGE=.*#MS_JMETER_IMAGE=\\\${MS_IMAGE_PREFIX}/jmeter:${JMETER_TAG}#g" install.conf
                         echo ${RELEASE}-b$BUILD_NUMBER > ./metersphere/version                   
                     '''
                 }
@@ -294,7 +294,7 @@ pipeline {
             steps {
                 dir('installer') {
                     script {
-                        def images = ['jmeter-master:${JMETER_TAG}',
+                        def images = ['jmeter:${JMETER_TAG}',
                                     'kafka:3.5.1',
                                     'mysql:8.0.34',
                                     'redis:7.0.12-alpine',
@@ -319,7 +319,7 @@ pipeline {
                         docker save ${IMAGE_PREFIX}/metersphere:${RELEASE} \\
                         ${IMAGE_PREFIX}/task-runner:${RELEASE} \\
                         ${IMAGE_PREFIX}/result-hub:${RELEASE} \\
-                        ${IMAGE_PREFIX}/jmeter-master:${JMETER_TAG} \\
+                        ${IMAGE_PREFIX}/jmeter:${JMETER_TAG} \\
                         ${IMAGE_PREFIX}/kafka:3.5.1 \\
                         ${IMAGE_PREFIX}/mysql:8.0.34 \\
                         ${IMAGE_PREFIX}/redis:7.0.12-alpine \\
diff --git a/install.conf b/install.conf
index 57f6034..314423a 100644
--- a/install.conf
+++ b/install.conf
@@ -8,7 +8,7 @@ MS_IMAGE_PREFIX='registry.cn-qingdao.aliyuncs.com/metersphere'
 ## 镜像标签, MeterSphere 相关组件使用的 Docker 镜像标签
 MS_IMAGE_TAG=dev
 ## 性能测试使用的 JMeter 镜像
-MS_JMETER_IMAGE=${MS_IMAGE_PREFIX}/jmeter-master:5.6-ms1-jdk17
+MS_JMETER_IMAGE=${MS_IMAGE_PREFIX}/jmeter:5.6.2-release1
 ## 安装模式 allinone | server | task-runner | selenium-hub | middleware
 MS_INSTALL_MODE=allinone
 ## MeterSphere 主程序的 HTTP 服务监听端口
diff --git a/metersphere/conf/metersphere.properties b/metersphere/conf/metersphere.properties
index 46bb8c1..d91e5b4 100644
--- a/metersphere/conf/metersphere.properties
+++ b/metersphere/conf/metersphere.properties
@@ -17,7 +17,7 @@ spring.session.store-type=redis
 
 # PROPERTIES FOR METERSPHERE NODE CONTROLLER
 ## JMETER
-#jmeter.image=registry.fit2cloud.com/metersphere/jmeter-master:0.0.7
+#jmeter.image=registry.fit2cloud.com/metersphere/jmeter:0.0.7
 
 
 ## CAS