diff --git a/bak_merge/.keep b/bak_merge/.keep deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/bak_merge/init.tar.gz0 b/bak_merge/init.tar.gz0 deleted file mode 100644 index 48787c7601ec7b54808548cb42f5ead4b855acc4..0000000000000000000000000000000000000000 Binary files a/bak_merge/init.tar.gz0 and /dev/null differ diff --git a/bak_merge/init.tar.gz1 b/bak_merge/init.tar.gz1 deleted file mode 100644 index 6835caeec86774af9e7e06b91593c00584b5eb14..0000000000000000000000000000000000000000 Binary files a/bak_merge/init.tar.gz1 and /dev/null differ diff --git a/bak_merge/init.tar.gz2 b/bak_merge/init.tar.gz2 deleted file mode 100644 index 45b96dec32d9a62c5b68cec40e4175c52242c79a..0000000000000000000000000000000000000000 Binary files a/bak_merge/init.tar.gz2 and /dev/null differ diff --git a/openharmony/OpenHarmony-5.0-Release/dayu200_5.0-Release b/openharmony/OpenHarmony-5.0-Release/dayu200_5.0-Release.json similarity index 99% rename from openharmony/OpenHarmony-5.0-Release/dayu200_5.0-Release rename to openharmony/OpenHarmony-5.0-Release/dayu200_5.0-Release.json index e8118fa5fa527c6f0fc1030a1bba3b8e0c004a1c..681e6fbe81971c9d20feaa69da547f99ba2959d2 100644 --- a/openharmony/OpenHarmony-5.0-Release/dayu200_5.0-Release +++ b/openharmony/OpenHarmony-5.0-Release/dayu200_5.0-Release.json @@ -1,13 +1,13 @@ -{ - "name": "dayu200_5.0-Release", - "manifestFile": "default.xml", - "hardwareBoard": "rk3568", - "deviceLevel": "L2", - "preCompile": "rm -rf prebuilts/build-tools/common/oh-command-line-tools;rm -rf prebuilts/ohos-sdk;yes y | apt install libxinerama-dev libxcursor-dev libxrandr-dev libxi-dev;bash build/prebuilts_download.sh", - "compileCMD": "echo 'start' && export NO_DEVTOOL=1 && export CCACHE_LOG_SUFFIX=\\\"dayu200-arm32\\\" && export CCACHE_NOHASHDIR=\\\"true\\\" && export CCACHE_SLOPPINESS=\\\"include_file_ctime\\\" && ./build.sh --product-name rk3568 --ccache --build-target make_all --build-target make_test --gn-args enable_notice_collection=false", - "afterCompile": "cp -rf out/rk3568/lib.unstripped out/rk3568/lib.unstripped2 && ./test/xts/acts/build.sh product_name=rk3568 system_size=standard &&./test/xts/dcts/build.sh product_name=rk3568 system_size=standard&&./test/xts/hats/build.sh product_name=rk3568 system_size=standard&& rm -rf out/rk3568/exe.unstripped/tests && rm -rf out/rk3568/suites/haps", - "resultList": "out/rk3568/packages/phone/images/chip_ckm.img out/rk3568/packages/phone/images/MiniLoaderAll.bin out/rk3568/suites out/rk3568/packages/phone/images/boot_linux.img out/rk3568/packages/phone/images/parameter.txt out/rk3568/packages/phone/images/system.img out/rk3568/packages/phone/images/uboot.img out/rk3568/packages/phone/images/userdata.img out/rk3568/packages/phone/images/vendor.img out/rk3568/packages/phone/images/boot_linux_5_10.img out/rk3568/packages/phone/images/uboot_5_10.img out/rk3568/packages/phone/images/resource.img out/rk3568/tests out/rk3568/lib.unstripped out/rk3568/lib.unstripped2 out/rk3568/exe.unstripped out/rk3568/build_configs/parts_info/parts_info.json out/rk3568/build.trace.gz out/rk3568/packages/phone/images/config.cfg out/rk3568/packages/phone/images/ramdisk.img out/rk3568/packages/phone/images/chipset.img out/rk3568/packages/phone/images/sys_prod.img out/rk3568/packages/phone/images/chip_prod.img out/rk3568/packages/phone/images/updater.img out/rk3568/packages/phone/updater/bin/updater_binary", - "dockerImage": "swr.cn-north-4.myhuaweicloud.com/harmonyos_ci/harmony-build-env:1.0.1", - "imgList": "out/rk3568/packages/phone/images/chip_ckm.img out/rk3568/packages/phone/images/MiniLoaderAll.bin out/rk3568/packages/phone/images/boot_linux.img out/rk3568/packages/phone/images/parameter.txt out/rk3568/packages/phone/images/system.img out/rk3568/packages/phone/images/uboot.img out/rk3568/packages/phone/images/userdata.img out/rk3568/packages/phone/images/vendor.img out/rk3568/packages/phone/images/resource.img out/rk3568/packages/phone/images/config.cfg out/rk3568/packages/phone/images/ramdisk.img out/rk3568/packages/phone/images/chipset.img out/rk3568/packages/phone/images/sys_prod.img out/rk3568/packages/phone/images/chip_prod.img out/rk3568/packages/phone/images/updater.img out/rk3568/packages/phone/updater/bin/updater_binary", - "testList": [] +{ + "name": "dayu200_5.0-Release", + "manifestFile": "default.xml", + "hardwareBoard": "rk3568", + "deviceLevel": "L2", + "preCompile": "rm -rf prebuilts/build-tools/common/oh-command-line-tools;rm -rf prebuilts/ohos-sdk;yes y | apt install libxinerama-dev libxcursor-dev libxrandr-dev libxi-dev;bash build/prebuilts_download.sh", + "compileCMD": "echo 'start' && export NO_DEVTOOL=1 && export CCACHE_LOG_SUFFIX=\\\"dayu200-arm32\\\" && export CCACHE_NOHASHDIR=\\\"true\\\" && export CCACHE_SLOPPINESS=\\\"include_file_ctime\\\" && ./build.sh --product-name rk3568 --ccache --build-target make_all --build-target make_test --gn-args enable_notice_collection=false", + "afterCompile": "cp -rf out/rk3568/lib.unstripped out/rk3568/lib.unstripped2 && ./test/xts/acts/build.sh product_name=rk3568 system_size=standard &&./test/xts/dcts/build.sh product_name=rk3568 system_size=standard&&./test/xts/hats/build.sh product_name=rk3568 system_size=standard&& rm -rf out/rk3568/exe.unstripped/tests && rm -rf out/rk3568/suites/haps", + "resultList": "out/rk3568/packages/phone/images/chip_ckm.img out/rk3568/packages/phone/images/MiniLoaderAll.bin out/rk3568/suites out/rk3568/packages/phone/images/boot_linux.img out/rk3568/packages/phone/images/parameter.txt out/rk3568/packages/phone/images/system.img out/rk3568/packages/phone/images/uboot.img out/rk3568/packages/phone/images/userdata.img out/rk3568/packages/phone/images/vendor.img out/rk3568/packages/phone/images/boot_linux_5_10.img out/rk3568/packages/phone/images/uboot_5_10.img out/rk3568/packages/phone/images/resource.img out/rk3568/tests out/rk3568/lib.unstripped out/rk3568/lib.unstripped2 out/rk3568/exe.unstripped out/rk3568/build_configs/parts_info/parts_info.json out/rk3568/build.trace.gz out/rk3568/packages/phone/images/config.cfg out/rk3568/packages/phone/images/ramdisk.img out/rk3568/packages/phone/images/chipset.img out/rk3568/packages/phone/images/sys_prod.img out/rk3568/packages/phone/images/chip_prod.img out/rk3568/packages/phone/images/updater.img out/rk3568/packages/phone/updater/bin/updater_binary", + "dockerImage": "swr.cn-north-4.myhuaweicloud.com/harmonyos_ci/harmony-build-env:1.0.1", + "imgList": "out/rk3568/packages/phone/images/chip_ckm.img out/rk3568/packages/phone/images/MiniLoaderAll.bin out/rk3568/packages/phone/images/boot_linux.img out/rk3568/packages/phone/images/parameter.txt out/rk3568/packages/phone/images/system.img out/rk3568/packages/phone/images/uboot.img out/rk3568/packages/phone/images/userdata.img out/rk3568/packages/phone/images/vendor.img out/rk3568/packages/phone/images/resource.img out/rk3568/packages/phone/images/config.cfg out/rk3568/packages/phone/images/ramdisk.img out/rk3568/packages/phone/images/chipset.img out/rk3568/packages/phone/images/sys_prod.img out/rk3568/packages/phone/images/chip_prod.img out/rk3568/packages/phone/images/updater.img out/rk3568/packages/phone/updater/bin/updater_binary", + "testList": [] } \ No newline at end of file diff --git a/openharmony/OpenHarmony-5.0-Release/hispark_pegasus_5.0-Release b/openharmony/OpenHarmony-5.0-Release/hispark_pegasus_5.0-Release.json similarity index 98% rename from openharmony/OpenHarmony-5.0-Release/hispark_pegasus_5.0-Release rename to openharmony/OpenHarmony-5.0-Release/hispark_pegasus_5.0-Release.json index bb63445219a0d725e04acbcdf8e3b1551a5ee985..74b13021e134494d49675ec41b80a86c17677aba 100644 --- a/openharmony/OpenHarmony-5.0-Release/hispark_pegasus_5.0-Release +++ b/openharmony/OpenHarmony-5.0-Release/hispark_pegasus_5.0-Release.json @@ -1,18 +1,18 @@ -{ - "name": "hispark_pegasus_5.0-Release", - "manifestFile": "default.xml", - "hardwareBoard": "Wifiiot", - "deviceLevel": "L0", - "preCompile": "echo $PATH;rm -rf /root/.npm/_logs/*;rm -rf L0L1/src;bash build/prebuilts_download.sh", - "compileCMD": "python3 build.py -p wifiiot_hispark_pegasus@hisilicon -f -b release && rm -rf out && mkdir out && ./test/xts/tools/lite/build.sh product=wifiiot xts=acts", - "afterCompile": "", - "resultList": "out/hispark_pegasus/wifiiot_hispark_pegasus/* out/hispark_pegasus/wifiiot_hispark_pegasus/system/etc/NOTICE.txt L0L1/src/wifiiot_hispark_pegasus_result.json", - "dockerImage": "swr.cn-north-4.myhuaweicloud.com/harmonyos_ci/harmony-build-env:1.0.1", - "imgList": "", - "testList": [ - { - "DuoBox": "false", - "EcoTestModule": "L0_Blue_comm" - } - ] +{ + "name": "hispark_pegasus_5.0-Release", + "manifestFile": "default.xml", + "hardwareBoard": "Wifiiot", + "deviceLevel": "L0", + "preCompile": "echo $PATH;rm -rf /root/.npm/_logs/*;rm -rf L0L1/src;bash build/prebuilts_download.sh", + "compileCMD": "python3 build.py -p wifiiot_hispark_pegasus@hisilicon -f -b release && rm -rf out && mkdir out && ./test/xts/tools/lite/build.sh product=wifiiot xts=acts", + "afterCompile": "", + "resultList": "out/hispark_pegasus/wifiiot_hispark_pegasus/* out/hispark_pegasus/wifiiot_hispark_pegasus/system/etc/NOTICE.txt L0L1/src/wifiiot_hispark_pegasus_result.json", + "dockerImage": "swr.cn-north-4.myhuaweicloud.com/harmonyos_ci/harmony-build-env:1.0.1", + "imgList": "", + "testList": [ + { + "DuoBox": "false", + "EcoTestModule": "L0_Blue_comm" + } + ] } \ No newline at end of file diff --git a/openharmony/OpenHarmony-5.0-Release/hispark_taurus_Linux_5.0-Release b/openharmony/OpenHarmony-5.0-Release/hispark_taurus_Linux_5.0-Release.json similarity index 99% rename from openharmony/OpenHarmony-5.0-Release/hispark_taurus_Linux_5.0-Release rename to openharmony/OpenHarmony-5.0-Release/hispark_taurus_Linux_5.0-Release.json index daf2ddc56ef2bb950a476c65f64fe0a0188710dc..d58d5151d6831f8c03755935399fd23871b90bd4 100644 --- a/openharmony/OpenHarmony-5.0-Release/hispark_taurus_Linux_5.0-Release +++ b/openharmony/OpenHarmony-5.0-Release/hispark_taurus_Linux_5.0-Release.json @@ -1,13 +1,13 @@ -{ - "name": "hispark_taurus_Linux_5.0-Release", - "manifestFile": "default.xml", - "hardwareBoard": "Hi3516DV300", - "deviceLevel": "L1", - "preCompile": "bash build/prebuilts_download.sh", - "compileCMD": "python3 build.py -p ipcamera_hispark_taurus_linux@hisilicon -f", - "afterCompile": "python3 build.py -p ipcamera_hispark_taurus_linux@hisilicon --gn-args build_xts=true && rm -rf out/hispark_taurus/ipcamera_hispark_taurus_linux/kernel out/hispark_taurus/ipcamera_hispark_taurus_linux/sysroot && python3 ./ci_tool/ci_build/reduce_unstripped_tdd_file.py './out/hispark_taurus/ipcamera_hispark_taurus_linux/test/unittest' 'daily' && python3 ./ci_tool/ci_build/reduce_unstripped_tdd_file.py './out/hispark_taurus/ipcamera_hispark_taurus_linux/test/unittest,./out/hispark_taurus/ipcamera_hispark_taurus_linux/suites/acts/testcases' 'write_testcases_txt';", - "resultList": "out/hispark_taurus/ipcamera_hispark_taurus_linux/* device/hisilicon/hispark_taurus/sdk_liteos/uboot/out/boot/u-boot-hi3516dv300.bin L0L1/src/ipcamera_hispark_taurus_linux_result.json", - "dockerImage": "swr.cn-north-4.myhuaweicloud.com/harmonyos_ci/harmony-build-env:1.0.1", - "imgList": "out/hispark_taurus/ipcamera_hispark_taurus_linux/* device/hisilicon/hispark_taurus/sdk_liteos/uboot/out/boot/u-boot-hi3516dv300.bin", - "testList": [] +{ + "name": "hispark_taurus_Linux_5.0-Release", + "manifestFile": "default.xml", + "hardwareBoard": "Hi3516DV300", + "deviceLevel": "L1", + "preCompile": "bash build/prebuilts_download.sh", + "compileCMD": "python3 build.py -p ipcamera_hispark_taurus_linux@hisilicon -f", + "afterCompile": "python3 build.py -p ipcamera_hispark_taurus_linux@hisilicon --gn-args build_xts=true && rm -rf out/hispark_taurus/ipcamera_hispark_taurus_linux/kernel out/hispark_taurus/ipcamera_hispark_taurus_linux/sysroot && python3 ./ci_tool/ci_build/reduce_unstripped_tdd_file.py './out/hispark_taurus/ipcamera_hispark_taurus_linux/test/unittest' 'daily' && python3 ./ci_tool/ci_build/reduce_unstripped_tdd_file.py './out/hispark_taurus/ipcamera_hispark_taurus_linux/test/unittest,./out/hispark_taurus/ipcamera_hispark_taurus_linux/suites/acts/testcases' 'write_testcases_txt';", + "resultList": "out/hispark_taurus/ipcamera_hispark_taurus_linux/* device/hisilicon/hispark_taurus/sdk_liteos/uboot/out/boot/u-boot-hi3516dv300.bin L0L1/src/ipcamera_hispark_taurus_linux_result.json", + "dockerImage": "swr.cn-north-4.myhuaweicloud.com/harmonyos_ci/harmony-build-env:1.0.1", + "imgList": "out/hispark_taurus/ipcamera_hispark_taurus_linux/* device/hisilicon/hispark_taurus/sdk_liteos/uboot/out/boot/u-boot-hi3516dv300.bin", + "testList": [] } \ No newline at end of file diff --git a/openharmony/OpenHarmony-5.0-Release/hispark_taurus_LiteOS_5.0-Release b/openharmony/OpenHarmony-5.0-Release/hispark_taurus_LiteOS_5.0-Release.json similarity index 94% rename from openharmony/OpenHarmony-5.0-Release/hispark_taurus_LiteOS_5.0-Release rename to openharmony/OpenHarmony-5.0-Release/hispark_taurus_LiteOS_5.0-Release.json index 8eb52305493c2fb4eca9b7c58f034bb55ffaac6c..1c1c88828f6c73eed7d4eb541178d5c9a82f7ba1 100644 --- a/openharmony/OpenHarmony-5.0-Release/hispark_taurus_LiteOS_5.0-Release +++ b/openharmony/OpenHarmony-5.0-Release/hispark_taurus_LiteOS_5.0-Release.json @@ -1,13 +1,13 @@ -{ - "name": "hispark_taurus_LiteOS", - "manifestFile": "default.xml", - "hardwareBoard": "Hi3516DV300", - "deviceLevel": "L1", - "preCompile": "rm -rf prebuilts/clang/ohos/darwin-x86_64/clang-480513;rm -rf prebuilts/clang/ohos/windows-x86_64/clang-480513;rm -rf prebuilts/clang/ohos/linux-x86_64/clang-480513;bash build/prebuilts_download.sh", - "compileCMD": "python3 build.py -p ipcamera_hispark_taurus@hisilicon -f --gn-args build_xts=true", - "afterCompile": "", - "resultList": "out/hispark_taurus/ipcamera_hispark_taurus/* device/board/hisilicon/hispark_taurus/uboot/out/boot/u-boot-hi3516dv300.bin", - "dockerImage": "swr.cn-north-4.myhuaweicloud.com/harmonyos_ci/harmony-build-env:1.0.1", - "imgList": "out/hispark_taurus/ipcamera_hispark_taurus/* device/board/hisilicon/hispark_taurus/uboot/out/boot/u-boot-hi3516dv300.bin", - "testList": [] +{ + "name": "hispark_taurus_LiteOS_5.0-Release", + "manifestFile": "default.xml", + "hardwareBoard": "Hi3516DV300", + "deviceLevel": "L1", + "preCompile": "rm -rf prebuilts/clang/ohos/darwin-x86_64/clang-480513;rm -rf prebuilts/clang/ohos/windows-x86_64/clang-480513;rm -rf prebuilts/clang/ohos/linux-x86_64/clang-480513;bash build/prebuilts_download.sh", + "compileCMD": "python3 build.py -p ipcamera_hispark_taurus@hisilicon -f --gn-args build_xts=true", + "afterCompile": "", + "resultList": "out/hispark_taurus/ipcamera_hispark_taurus/* device/board/hisilicon/hispark_taurus/uboot/out/boot/u-boot-hi3516dv300.bin", + "dockerImage": "swr.cn-north-4.myhuaweicloud.com/harmonyos_ci/harmony-build-env:1.0.1", + "imgList": "out/hispark_taurus/ipcamera_hispark_taurus/* device/board/hisilicon/hispark_taurus/uboot/out/boot/u-boot-hi3516dv300.bin", + "testList": [] } \ No newline at end of file diff --git a/openharmony/OpenHarmony-5.0-Release/ohos-sdk-full_5.0-Release b/openharmony/OpenHarmony-5.0-Release/ohos-sdk-full_5.0-Release.json similarity index 98% rename from openharmony/OpenHarmony-5.0-Release/ohos-sdk-full_5.0-Release rename to openharmony/OpenHarmony-5.0-Release/ohos-sdk-full_5.0-Release.json index 717683bcf48b5face110737b59c77198e91327f1..3444efb5f0f45d87921787de69253f07ec816df4 100644 --- a/openharmony/OpenHarmony-5.0-Release/ohos-sdk-full_5.0-Release +++ b/openharmony/OpenHarmony-5.0-Release/ohos-sdk-full_5.0-Release.json @@ -1,13 +1,13 @@ -{ - "name": "ohos-sdk-full_5.0-Release", - "manifestFile": "default.xml", - "hardwareBoard": "Hi3516DV300", - "deviceLevel": "L2", - "preCompile": "yes y | apt install libxinerama-dev libxcursor-dev libxrandr-dev libxi-dev && bash build/prebuilts_download.sh -ndk && apt-get update -qqy && apt-get install doxygen -y --force-yes", - "compileCMD": "./build.sh --product-name ohos-sdk", - "afterCompile": "", - "resultList": "out/sdk/packages/ohos-sdk/windows out/sdk/packages/ohos-sdk/linux", - "dockerImage": "swr.cn-north-4.myhuaweicloud.com/harmonyos_ci/harmony-build-env:1.00", - "imgList": "", - "testList": [] +{ + "name": "ohos-sdk-full_5.0-Release", + "manifestFile": "default.xml", + "hardwareBoard": "Hi3516DV300", + "deviceLevel": "L2", + "preCompile": "yes y | apt install libxinerama-dev libxcursor-dev libxrandr-dev libxi-dev && bash build/prebuilts_download.sh -ndk && apt-get update -qqy && apt-get install doxygen -y --force-yes", + "compileCMD": "./build.sh --product-name ohos-sdk", + "afterCompile": "", + "resultList": "out/sdk/packages/ohos-sdk/windows out/sdk/packages/ohos-sdk/linux", + "dockerImage": "swr.cn-north-4.myhuaweicloud.com/harmonyos_ci/harmony-build-env:1.00", + "imgList": "", + "testList": [] } \ No newline at end of file diff --git a/openharmony/OpenHarmony-5.0-Release/ohos-sdk-public_5.0-Release b/openharmony/OpenHarmony-5.0-Release/ohos-sdk-public_5.0-Release.json similarity index 98% rename from openharmony/OpenHarmony-5.0-Release/ohos-sdk-public_5.0-Release rename to openharmony/OpenHarmony-5.0-Release/ohos-sdk-public_5.0-Release.json index 3eadcaa0510a6c7df4708e8928ac57adfeb64be3..5ff18ee7a0ac7ce9748ca5996e1a98728d70b3e1 100644 --- a/openharmony/OpenHarmony-5.0-Release/ohos-sdk-public_5.0-Release +++ b/openharmony/OpenHarmony-5.0-Release/ohos-sdk-public_5.0-Release.json @@ -1,13 +1,13 @@ -{ - "name": "ohos-sdk-public_5.0-Release", - "manifestFile": "default.xml", - "hardwareBoard": "Hi3516DV300", - "deviceLevel": "L2", - "preCompile": "rm -rf prebuilts/ohos-sdk;yes y | apt install libxinerama-dev libxcursor-dev libxrandr-dev libxi-dev && bash build/prebuilts_download.sh -ndk && apt-get update -qqy && apt-get install doxygen -y --force-yes", - "compileCMD": "./build.sh --product-name ohos-sdk --gn-args=sdk_build_public=true", - "afterCompile": "", - "resultList": "out/sdk/packages/ohos-sdk/windows out/sdk/packages/ohos-sdk/linux", - "dockerImage": "swr.cn-north-4.myhuaweicloud.com/harmonyos_ci/harmony-build-env:1.00", - "imgList": "", - "testList": [] +{ + "name": "ohos-sdk-public_5.0-Release", + "manifestFile": "default.xml", + "hardwareBoard": "Hi3516DV300", + "deviceLevel": "L2", + "preCompile": "rm -rf prebuilts/ohos-sdk;yes y | apt install libxinerama-dev libxcursor-dev libxrandr-dev libxi-dev && bash build/prebuilts_download.sh -ndk && apt-get update -qqy && apt-get install doxygen -y --force-yes", + "compileCMD": "./build.sh --product-name ohos-sdk --gn-args=sdk_build_public=true", + "afterCompile": "", + "resultList": "out/sdk/packages/ohos-sdk/windows out/sdk/packages/ohos-sdk/linux", + "dockerImage": "swr.cn-north-4.myhuaweicloud.com/harmonyos_ci/harmony-build-env:1.00", + "imgList": "", + "testList": [] } \ No newline at end of file