diff --git a/tools/download_and_deploy/src/download/download_config.py b/tools/download_and_deploy/src/download/download_config.py index a9fdc378cc8193d92410a9d103ffc38cc044310d..15be33d7fdb885a1fd9199623b00875d143e42bc 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 5b09cc14391409c2820e9e2e5caa0f2f6dfe22b3..9a4509911acc85f89ee02aa65b13545f91422500 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,12 +121,12 @@ byte-alignment-check: - kunpeng_scanner # 对应gitlab-runner注册时的标签,可选择多个 script: - echo '====== 字节对齐检查 ======' - - devkit advisor byte-align -i ./ -c $BYTE_ALIGNMENT_COMMAND -b $BYTE_ALIGNMENT_TOOL -r html - - mv ./byte-align*.html ./byte-alignment-check.html + - devkit advisor addr-align -i ./ -c $BYTE_ALIGNMENT_COMMAND -b $BYTE_ALIGNMENT_TOOL -r html + - mv ./addr-align*.html ./byte-alignment-check.html artifacts: paths: - byte-alignment-check.html - name: byte-align + name: addr-align """ memory_consistency_template = """ # 内存一致性检查 @@ -137,12 +137,12 @@ memory-consistency-check: script: - echo '====== 内存一致性检查 ======' # 需编写生成的BC文件脚本 - - devkit advisor mem-cons -i ./ -f $MEMORY_BC_FILE -r html - - mv ./mem-cons*.html ./memory-consistency-check.html + - devkit advisor mm-check -i ./ -f $MEMORY_BC_FILE -r 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 fed3314228f7db1d9a4dca24eed8d8681e18a066..f58167f9fba19e98c00364e5a694adcc69f8dfe0 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,11 +282,11 @@ 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 ''' - 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 @@ -337,11 +337,11 @@ 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 ''' - 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