From 19ae3352fa8b3418bcb844f082991bcdcdc65849 Mon Sep 17 00:00:00 2001 From: cc <18856836718@163.com> Date: Mon, 29 Jul 2024 17:29:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF=E8=84=9A=E6=9C=AC=E7=94=9F=E6=88=90=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E4=BA=B2=E5=92=8C=E7=9B=B8=E5=85=B3=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/download_and_deploy/src/download/download_config.py | 6 +++--- .../src/pipeline_script_generator/gitlab_generator.py | 6 +++--- .../src/pipeline_script_generator/jenkins_generator.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/download_and_deploy/src/download/download_config.py b/tools/download_and_deploy/src/download/download_config.py index a9fdc37..15be33d 100644 --- a/tools/download_and_deploy/src/download/download_config.py +++ b/tools/download_and_deploy/src/download/download_config.py @@ -21,19 +21,19 @@ BiShengJDK17 = { CompatibilityTesting = { "component_name": "CompatibilityTesting", - "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.2/compatibility_testing.tar.gz", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.3/compatibility_testing.tar.gz", "file_size": "76451308", } DevKitTester = { "component_name": "DevKitTester", - "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.2/devkit_tester.tar.gz", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.3/devkit_tester.tar.gz", "file_size": "36153017", } A_FOT = { "component_name": "A-FOT", - "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.2/a-fot.tar.gz", + "file": "https://gitee.com/openeuler/devkit-pipeline/releases/download/v1.0.3/a-fot.tar.gz", "file_size": "15740", } 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 5b09cc1..401dd82 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 @@ -106,7 +106,7 @@ software-migration-assessment: - kunpeng_scanner # 对应gitlab-runner注册时的标签，可选择多个 script: - echo '====== 64位运行模式检查 ======' - - devkit advisor mode-check -i ./ -r html + - devkit advisor run-mode -i ./ -r html - mv ./mode_check*.html ./64-bit-running-mode-check.html artifacts: paths: @@ -121,7 +121,7 @@ byte-alignment-check: - kunpeng_scanner # 对应gitlab-runner注册时的标签，可选择多个 script: - echo '====== 字节对齐检查 ======' - - devkit advisor byte-align -i ./ -c $BYTE_ALIGNMENT_COMMAND -b $BYTE_ALIGNMENT_TOOL -r html + - devkit advisor addr-align -i ./ -c $BYTE_ALIGNMENT_COMMAND -b $BYTE_ALIGNMENT_TOOL -r html - mv ./byte-align*.html ./byte-alignment-check.html artifacts: paths: @@ -137,7 +137,7 @@ memory-consistency-check: script: - echo '====== 内存一致性检查 ======' # 需编写生成的BC文件脚本 - - devkit advisor mem-cons -i ./ -f $MEMORY_BC_FILE -r html + - devkit advisor mm-check -i ./ -f $MEMORY_BC_FILE -r html - mv ./mem-cons*.html ./memory-consistency-check.html artifacts: paths: 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 fed3314..4dcc25e 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 @@ -227,7 +227,7 @@ pipeline { ''' script{ def STATUS_CODE = sh(returnStatus: true, script: ''' - devkit advisor mode-check -i "./${GIT_TARGET_DIR_NAME}" -r html -o ./report_dir + devkit advisor run-mode -i "./${GIT_TARGET_DIR_NAME}" -r html -o ./report_dir ''') sh ''' @@ -282,7 +282,7 @@ pipeline { ''' script{ def STATUS_CODE = sh(returnStatus: true, script: ''' - devkit advisor byte-align -i "./${GIT_TARGET_DIR_NAME}" -c "${BYTE_ALIGNMENT_COMMAND}" -b "${BYTE_ALIGNMENT_TOOL}" -r html -o ./report_dir + devkit advisor addr-align -i "./${GIT_TARGET_DIR_NAME}" -c "${BYTE_ALIGNMENT_COMMAND}" -b "${BYTE_ALIGNMENT_TOOL}" -r html -o ./report_dir ''') sh ''' @@ -337,7 +337,7 @@ pipeline { ''' script{ def STATUS_CODE = sh(returnStatus: true, script: ''' - devkit advisor mem-cons -i "./${GIT_TARGET_DIR_NAME}" -f "${MEMORY_BC_FILE}" -r html -o ./report_dir + devkit advisor mm-check -i "./${GIT_TARGET_DIR_NAME}" -f "${MEMORY_BC_FILE}" -r html -o ./report_dir ''') sh ''' -- Gitee From e93380390b1a2b58848796752245c06db82218f2 Mon Sep 17 00:00:00 2001 From: cc <18856836718@163.com> Date: Tue, 30 Jul 2024 10:53:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=8A=A5=E5=91=8A=E7=9A=84=E5=8E=9F=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pipeline_script_generator/gitlab_generator.py | 8 ++++---- .../src/pipeline_script_generator/jenkins_generator.py | 4 ++-- 2 files changed, 6 insertions(+), 6 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 401dd82..9a45099 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 @@ -122,11 +122,11 @@ byte-alignment-check: script: - echo '====== 字节对齐检查 ======' - devkit advisor addr-align -i ./ -c $BYTE_ALIGNMENT_COMMAND -b $BYTE_ALIGNMENT_TOOL -r html - - mv ./byte-align*.html ./byte-alignment-check.html + - mv ./addr-align*.html ./byte-alignment-check.html artifacts: paths: - byte-alignment-check.html - name: byte-align + name: addr-align """ memory_consistency_template = """ # 内存一致性检查 @@ -138,11 +138,11 @@ memory-consistency-check: - echo '====== 内存一致性检查 ======' # 需编写生成的BC文件脚本 - devkit advisor mm-check -i ./ -f $MEMORY_BC_FILE -r html - - mv ./mem-cons*.html ./memory-consistency-check.html + - mv ./mem-check*.html ./memory-consistency-check.html artifacts: paths: - memory-consistency-check.html - name: mem-cons + name: mem-check """ vector_check_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 4dcc25e..f58167f 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 @@ -286,7 +286,7 @@ pipeline { ''') sh ''' - html_file_name=$(find ./report_dir -name byte-align*.html) + html_file_name=$(find ./report_dir -name addr-align*.html) if [[ ${html_file_name} ]]; then mv ${html_file_name} ./report_dir/byte-alignment-check.html fi @@ -341,7 +341,7 @@ pipeline { ''') sh ''' - html_file_name=$(find ./report_dir -name mem-cons*.html) + html_file_name=$(find ./report_dir -name mem-check*.html) if [[ ${html_file_name} ]]; then mv ${html_file_name} ./report_dir/memory-consistency-check.html fi -- Gitee