From ade0ba3ffc085a544ca21815dc0295bf09a0f73c Mon Sep 17 00:00:00 2001
From: pan <601760354@163.com>
Date: Thu, 13 Jun 2024 20:37:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=9A=94=E7=AC=A6?=
 =?UTF-8?q?=EF=BC=8C=E9=80=82=E9=85=8Dgitlab=E5=92=8Cjenkins?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pipeline_script_generator/gitlab_generator.py        | 5 ++++-
 .../src/pipeline_script_generator/jenkins_generator.py       | 1 +
 .../src/pipeline_script_generator/script_generator.py        | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/download_and_deploy/src/pipeline_script_generator/gitlab_generator.py b/tools/download_and_deploy/src/pipeline_script_generator/gitlab_generator.py
index 7d9ba66..78571e8 100644
--- a/tools/download_and_deploy/src/pipeline_script_generator/gitlab_generator.py
+++ b/tools/download_and_deploy/src/pipeline_script_generator/gitlab_generator.py
@@ -3,6 +3,7 @@ from pipeline_script_generator.script_generator import ScriptGenerator
 
 class GitlabScript(ScriptGenerator):
     name = "gitlab"
+    seprator = "#"
     base_template = """
 stages:
   - migrating-applications
@@ -39,6 +40,8 @@ variables:
   # 编译参数
   # 编译命令
   BUILD_COMMAND: ""
+  # A-FOT配置文件存放路径
+  A_FOT_CONF_PATH： ""
   
   # Java Performance Analysis功能参数
   # 需要采集的目标程序所在的服务器地址， 多个使用逗号隔离
@@ -195,7 +198,7 @@ A-FOT:
     - kunpeng_c_builder_gcc # 对应gitlab-runner注册时的标签，可选择多个
   script:
     - export PATH=${HOME}/.local/gcc-10.3.1-2023.12-aarch64-linux/bin:$PATH
-    - a-fot --config_file a-fot.ini    
+    - a-fot --config_file $A_FOT_CONF_PATH/a-fot.ini    
 """
     java_perf_template = ""
     compatibility_test_template = """
diff --git a/tools/download_and_deploy/src/pipeline_script_generator/jenkins_generator.py b/tools/download_and_deploy/src/pipeline_script_generator/jenkins_generator.py
index 5004522..6183724 100644
--- a/tools/download_and_deploy/src/pipeline_script_generator/jenkins_generator.py
+++ b/tools/download_and_deploy/src/pipeline_script_generator/jenkins_generator.py
@@ -3,6 +3,7 @@ from pipeline_script_generator.script_generator import ScriptGenerator
 
 class JenkinsScript(ScriptGenerator):
     name = "jenkins"
+    seprator = "/"
     base_template = """
 def get_code(GIT_BRANCH, GIT_TARGET_DIR_NAME, GIT_URL) {
     sh '''
diff --git a/tools/download_and_deploy/src/pipeline_script_generator/script_generator.py b/tools/download_and_deploy/src/pipeline_script_generator/script_generator.py
index 18bdec5..83a434f 100644
--- a/tools/download_and_deploy/src/pipeline_script_generator/script_generator.py
+++ b/tools/download_and_deploy/src/pipeline_script_generator/script_generator.py
@@ -3,6 +3,7 @@ from constant import *
 
 class ScriptGenerator:
     name = ""
+    seprator = "/"
     base_template = ""
     source_migration_template = ""
     package_migration_template = ""
@@ -39,7 +40,7 @@ class ScriptGenerator:
         }
 
     def generate(self):
-        separator = "/" + "*"*120 + "/\n"
+        separator = self.seprator * 120 + "\n"
         conf = separator
         for role in ROLE_LIST:
             if role not in self.data:
-- 
Gitee