diff --git a/agent-operator/ImageSyncDLTU.sh b/agent-operator/ImageSyncDLTU.sh new file mode 100644 index 0000000..55674e7 --- /dev/null +++ b/agent-operator/ImageSyncDLTU.sh @@ -0,0 +1,78 @@ +#!/bin/bash + +all_image_list_txt="all-cmii-image-list.txt" # 需要修改版本 +gzip_image_list_txt="all-gzip-image-list.txt" # 一般不需要修改 +oss_prefix_url="https://oss.demo.uavcmlc.com/cmlc-installation" +local_gzip_path="/root/wdd/octopus_image" +DockerRegisterDomain="harbor.cdcyy.com.cn" # 需要根据实际修改 +HarborAdminPass=V2ryStr@ngPss # 需要跟第一脚本中的密码保持一致 + +print_green() { + echo -e "\033[32m${1}\033[0m" + echo "" +} + +print_red() { + echo -e "\033[31m${1}\033[0m" + echo "" +} + +Download_Load_Tag_Upload() { + print_green "[DLTU] - start !" + while [[ $# -gt 0 ]]; do + case "$1" in + rke) + # print_green "download rke " + local_gzip_path="$local_gzip_path/rke" + mkdir -p ${local_gzip_path} + oss_prefix_url="$oss_prefix_url/rke/" + dltu + shift # past argument + ;; + middle) + local_gzip_path="$local_gzip_path/middle" + mkdir -p $local_gzip_path + oss_prefix_url="$oss_prefix_url/middle/" + dltu + shift # past argument + ;; + cmii) + local_gzip_path="$local_gzip_path/cmii" + mkdir -p $local_gzip_path + oss_prefix_url="$oss_prefix_url/cmii/" + dltu + shift # past argument + ;; + *) + # unknown option + print_red "bad arguments" + ;; + esac + shift # past argument or value + done + +} + +dltu() { + print_green "download all image name list and gzip file list!" + cd $local_gzip_path || exit + wget "$oss_prefix_url$all_image_list_txt" + wget "$oss_prefix_url$gzip_image_list_txt" + + pulled="" + while IFS= read -r i; do + [ -z "${i}" ] && continue + echo "download gzip file =>: ${i}" + if wget "$oss_prefix_url${i}" >/dev/null 2>&1; then + echo "Gzip file download success : ${i}" + pulled="${pulled} ${i}" + else + print_red "Gzip file download FAILED : ${i}" + fi + echo "-------------------------------------------------" + done <"${gzip_image_list_txt}" + shift + +} + +Download_Load_Tag_Upload "rke" diff --git a/agent-operator/log/cmii-update-log.txt b/agent-operator/log/cmii-update-log.txt index b389e5c..bb53473 100755 --- a/agent-operator/log/cmii-update-log.txt +++ b/agent-operator/log/cmii-update-log.txt @@ -106,6 +106,10 @@ 2024-07-12-11-40-00 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071201 5.6.0-071202 2024-07-15-10-05-51 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071206 5.6.0-071501 2024-07-16-17-06-59 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071501 5.6.0-071601 +2024-07-23-09-35-40 uavcloud-demo cmii-uas-lifecycle 5.7.0-snapshot 5.7.0-30403-072301 +2024-07-23-10-53-00 uavcloud-demo cmii-uav-platform 5.7.0 5.7.0-29267-072301 +2024-07-23-13-43-35 uavcloud-demo cmii-uav-industrial-portfolio 5.7.0-31369-yunnan-0723 5.7.0-31369-yunnan-072301 +2024-07-23-15-18-56 uavcloud-demo cmii-uav-platform 5.7.0-29267-072301 5.7.0 2024-07-17-14-37-11 uavcloud-demo cmii-uav-industrial-portfolio 5.6.0-071601 5.6.0-071701 2024-07-17-17-45-00 uavcloud-demo cmii-uav-platform 5.6.0-29267-0717 5.6.0-071701 2024-07-17-17-45-09 uavcloud-demo cmii-uas-lifecycle 5.6.0 5.6.0-30403-071701 diff --git a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java index 78a67c6..4e0e3c7 100755 --- a/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java +++ b/server/src/test/java/io/wdd/server/func/TestBaseFuncScheduler.java @@ -126,25 +126,25 @@ public class TestBaseFuncScheduler { throw new RuntimeException(e); } - baseFuncScheduler.runProcedure(projectDeployContext); +// baseFuncScheduler.runProcedure(projectDeployContext); // 只能支持 带端口的HarborHost 默认为8033Chengdu-amd64-110 -// harborFuncScheduler.runProcedure(projectDeployContext); + harborFuncScheduler.runProcedure(projectDeployContext); List appFunctionEnumList = List.of( -// AppFunctionEnum.DEPLOY_CHRONY_SERVER, -// AppFunctionEnum.DEPLOY_RKE + AppFunctionEnum.DEPLOY_CHRONY_SERVER, + AppFunctionEnum.DEPLOY_RKE // AppFunctionEnum.DEPLOY_K8S_DASHBOARD, // AppFunctionEnum.DEPLOY_NFS, // AppFunctionEnum.DEPLOY_TEST_NFS - AppFunctionEnum.DEPLOY_K8S_NAMESPACE, - AppFunctionEnum.DEPLOY_K8S_PVC, - AppFunctionEnum.DEPLOY_K8S_MYSQL, - AppFunctionEnum.DEPLOY_K8S_REDIS, - AppFunctionEnum.DEPLOY_K8S_MIDDLEWARES +// AppFunctionEnum.DEPLOY_K8S_NAMESPACE, +// AppFunctionEnum.DEPLOY_K8S_PVC, +// AppFunctionEnum.DEPLOY_K8S_MYSQL, +// AppFunctionEnum.DEPLOY_K8S_REDIS, +// AppFunctionEnum.DEPLOY_K8S_MIDDLEWARES // AppFunctionEnum.DEPLOY_INGRESS, // AppFunctionEnum.DEPLOY_FRONTEND,