Merge branch 'master' into youji-dev

Author: lvjing2

samples/ccbin/arkctl renamed to .github/workflows/ccbin/arkctl

@@ -63,7 +63,35 @@ EOF
 
 function arkctl_module_biz_install_test() {
   bizName=$1
-  bizDir=$2
+  bizVersion=$2
+  bizDir=$3
+
+  arkctl deploy $bizDir
+  arkStatus=$(arkctl status)
+  # 提取数据部分
+  data=$(echo $arkStatus | awk -F "QueryAllBiz " '{print $2}')
+  # 校验状态
+  if echo $data | grep -q "\"bizName\":\"$bizName\",\"bizState\":\"ACTIVATED\""; then
+      echo "biz $bizName install success"
+  else
+      echo "biz $bizName install failed：$arkStatus"
+      exit 1
+  fi
+  # 卸载模块
+  uninstallResult=$(curl --location 'http://localhost:1238/uninstallBiz' \
+  --header 'Content-Type: application/json' \
+  --data "{
+      \"bizName\":\"$bizName\",
+      \"bizVersion\":\"$bizVersion\"
+  }")
+  # 校验卸载
+  if echo $uninstallResult | grep -q "Uninstall biz: $bizName:$bizVersion success."; then
+      echo "biz $bizName unInstall success"
+  else
+      echo "biz $bizName unInstall failed：$uninstallResult"
+      exit 1
+  fi
+  # 2次安装
   arkctl deploy $bizDir
   arkStatus=$(arkctl status)
   # 提取数据部分
@@ -85,20 +113,17 @@ cd $BaseDir/..
 BIZ_INSTALL_URL="http://localhost:8080/module/install"
 BIZ_LIST_URL="http://localhost:8080/module/list"
 
-for moduleBootDir in $(find $(pwd) -type d -path "*/biz[1-9]"  -o -path "*/*biz" |grep -v src|grep -v target|grep -v log);do
+for moduleBootDir in $(find $(pwd) -type d -path "*/biz[1-9]"  -o -path "*/*biz" |grep -v src|grep -v target|grep -v logs);do
   echo "start deploy $moduleBootDir"
   cd $moduleBootDir
 
   echo "找到$(find $(pwd) -name "*-ark-biz.jar" | wc -l)个模块！"
   for moduleJar in $(find $(pwd) -name "*-ark-biz.jar");do
-    if echo "$moduleJar" | grep -q "redis-biz-bootstrap";then
-      moduleName=$(echo $moduleJar |awk -F "target/redis-" '{print $2}' |awk -F "-" '{print $1}')
-    else
-      moduleName=$(echo $moduleJar |awk -F "target/" '{print $2}' |awk -F "-" '{print $1}')
-    fi
-    echo "find one module:$moduleName, jar:$moduleJar"
+    moduleName=$(echo $moduleJar |awk -F "target/" '{print $2}' | sed -e 's/-[0-9].*$//')
+    moduleVersion=$(echo "$moduleJar" | sed "s/.*$moduleName-\(.*\)-ark-biz.jar/\1/")
+    echo "find one module, moduleName:$moduleName,moduleVersion:$moduleVersion, jar:$moduleJar"
     echo ''>test_output.txt
-    arkctl_module_biz_install_test ${moduleName} $moduleJar
+    arkctl_module_biz_install_test ${moduleName} ${moduleVersion} $moduleJar
 #    echo "start check module install result "
 #    cat test_output.txt|while read line;do
 #      if [[ $line =~ "failed" ]];then

samples/ccbin/healthcheck.sh renamed to .github/workflows/ccbin/healthcheck.sh

@@ -24,6 +24,7 @@ function kill_java_process() {
 set -e
 
 #dobbo common-model
+ROOTDir=$(pwd)
 testSuite=$1
 echo "start testsuite:$testSuite"
 if [[ $testSuite == "jdk8" ]];then
@@ -38,7 +39,7 @@ for TEST_DIR in $(find $(pwd) -name "$suiteReg");do
   TESTAPP_DIR=$TEST_DIR
   echo "TESTAPP_DIR=$TESTAPP_DIR"
   cd ${TESTAPP_DIR}
-  mvn clean install -U -Dmaven.test.skip=true >>/tmp/mvn.out
+  mvn clean install -U -Dmaven.test.skip=true
   for BaseDir in $( find $(pwd)  -type d -name "*base" |grep -v src|grep -v target|grep -v mybatis|grep -v logs);do
     echo "BaseDir $BaseDir"
     export BaseDir=$BaseDir
@@ -57,10 +58,10 @@ for TEST_DIR in $(find $(pwd) -name "$suiteReg");do
     sleep 5
 
     echo "Start health check"
-    bash $TESTAPP_DIR/../ccbin/healthcheck.sh
+    bash $ROOTDir/.github/workflows/ccbin/healthcheck.sh
 
     echo "Start module biz Test"
-    bash $TESTAPP_DIR/../ccbin/moduletest.sh
+    bash $ROOTDir/.github/workflows/ccbin/moduletest.sh
 
     echo "测试通过 $BaseDir"
 

samples/ccbin/moduletest.sh renamed to .github/workflows/ccbin/moduletest.sh

@@ -176,6 +176,7 @@ jobs:
               exit 0
             else
               echo "等待字段值满足条件..."
+              echo "期望状态是: $desired_field_value, 当前状态是: $field_value"
               sleep 5  # 等待一段时间后再次检查
             fi
           done
@@ -487,4 +488,4 @@ jobs:
             fi
             sleep 5
             fi
-          done
+          done

samples/ccbin/start.sh renamed to .github/workflows/ccbin/start.sh

@@ -34,7 +34,8 @@ jobs:
         run: |
           serverless_runtime_version=`egrep "<revision.default>([^<]+)</revision.default>" sofa-serverless-runtime/pom.xml |awk -F "revision.default>|</revision.default" '{print $2}'`
           echo "升级sofa-runtime version to $serverless_runtime_version"
-          for testsample in `find samples -name "*-samples"`;do  sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version<\/sofa.serverless.runtime.version>/g"  $testsample/pom.xml ;done
+          for testsample in `find samples -name "*[^3|^dubbo]-samples"`;do  sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version<\/sofa.serverless.runtime.version>/g"  $testsample/pom.xml ;done
+          for testsample in `find samples -name "*[3]-samples"`;do  sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version-jdk17<\/sofa.serverless.runtime.version>/g"  $testsample/pom.xml ;done
           for testsample in `find samples -name "*[^dubbo]-samples"`;do if cat $testsample/pom.xml |grep "<sofa.serverless.runtime.version>"|grep $serverless_runtime_version;then echo "版本校验通过";else echo "版本校验失败";exit 1;fi;done
 
       - name: Test Env prepare
@@ -47,7 +48,7 @@ jobs:
           docker run -p 2181:2181 -it --name zookeeper --restart always -d zookeeper:3.9.0
           sudo apt-get install redis-server -y
           sudo systemctl start redis-server
-          sudo cp samples/ccbin/arkctl /usr/bin/arkctl
+          sudo cp .github/workflows/ccbin/arkctl /usr/bin/arkctl 
 
       - name: Run jdk8 serverless runtime test
         run: |
@@ -61,6 +62,10 @@ jobs:
           distribution: 'temurin'
           cache: maven
 
+      - name: Build with Maven
+        working-directory: sofa-serverless-runtime
+        run: mvn clean install -P17-release -DskipTests -B -U -e && sh ./check_format.sh
+
       - name: Run jdk17 serverless runtime test
         run: |
           set -e

.github/workflows/module_controller_ci_build_deploy_to_aliyun.yml

@@ -34,7 +34,8 @@ jobs:
         run: |
           serverless_runtime_version=`egrep "<revision.default>([^<]+)</revision.default>" sofa-serverless-runtime/pom.xml |awk -F "revision.default>|</revision.default" '{print $2}'`
           echo "升级sofa-runtime version to $serverless_runtime_version"
-          for testsample in `find samples -name "*-samples"`;do  sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version<\/sofa.serverless.runtime.version>/g"  $testsample/pom.xml ;done
+          for testsample in `find samples -name "*[^3|^dubbo]-samples"`;do  sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version<\/sofa.serverless.runtime.version>/g"  $testsample/pom.xml ;done
+          for testsample in `find samples -name "*[3]-samples"`;do  sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version-jdk17<\/sofa.serverless.runtime.version>/g"  $testsample/pom.xml ;done
           for testsample in `find samples -name "*[^dubbo]-samples"`;do if cat $testsample/pom.xml |grep "<sofa.serverless.runtime.version>"|grep $serverless_runtime_version;then echo "版本校验通过";else echo "版本校验失败";exit 1;fi;done
 
       - name: Test Env prepare
@@ -47,12 +48,12 @@ jobs:
           docker run -p 2181:2181 -it --name zookeeper --restart always -d zookeeper:3.9.0
           sudo apt-get install redis-server -y
           sudo systemctl start redis-server
-          sudo cp samples/ccbin/arkctl /usr/bin/arkctl
+          sudo cp .github/workflows/ccbin/arkctl /usr/bin/arkctl
 
       - name: Run jdk8 serverless runtime test
         run: |
           set -e
-          bash samples/ccbin/start.sh jdk8
+          bash .github/workflows/ccbin/start.sh jdk8
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3
@@ -61,10 +62,14 @@ jobs:
           distribution: 'temurin'
           cache: maven
 
+      - name: Build with Maven
+        working-directory: sofa-serverless-runtime
+        run: mvn clean install -P17-release -DskipTests -B -U -e
+
       - name: Run jdk17 serverless runtime test
         run: |
           set -e
-          bash samples/ccbin/start.sh jdk17
+          bash .github/workflows/ccbin/start.sh jdk17
 
   release_for_jdk8:
     needs: build_and_test

.github/workflows/serverless_runtime_release.yml

@@ -48,7 +48,8 @@ const (
 	ModuleDeploymentReleaseProgressPaused                 ReleaseProgress = "Paused"
 	ModuleDeploymentReleaseProgressCompleted              ReleaseProgress = "Completed"
 	ModuleDeploymentReleaseProgressAborted                ReleaseProgress = "Aborted"
-	ModuleDeploymentReleaseProgressTermed                 ReleaseProgress = "Terminated"
+	ModuleDeploymentReleaseProgressTerminating            ReleaseProgress = "Terminating"
+	ModuleDeploymentReleaseProgressTerminated             ReleaseProgress = "Terminated"
 )
 
 type ModuleUpgradeType string
@@ -120,7 +121,7 @@ type ModuleOperationStrategy struct {
 
 	BatchCount int32 `json:"batchCount,omitempty"`
 
-	MaxUnavailable *intstr.IntOrString `json:"maxUnavailable,omitempty"`
+	MaxUnavailable int32 `json:"maxUnavailable,omitempty"`
 
 	GrayTimeBetweenBatchSeconds int32 `json:"grayTimeBetweenBatchSeconds,omitempty"`
 

.github/workflows/serverless_runtime_snapshot.yml

@@ -53,10 +53,8 @@ spec:
                     format: int32
                     type: integer
                   maxUnavailable:
-                    anyOf:
-                    - type: integer
-                    - type: string
-                    x-kubernetes-int-or-string: true
+                    format: int32
+                    type: integer
                   needConfirm:
                     type: boolean
                   serviceStrategy: