Skip to content
This repository was archived by the owner on Feb 18, 2024. It is now read-only.

Commit ea1c8cc

Browse files
lvjing2lvjing2
authored
Merge pull request #343 from gongjiu/master
add jdk17 ci test,add arkctl operation test
2 parents a48ea15 + 1eb65a3 commit ea1c8cc

File tree

38 files changed

+87
-51
lines changed

38 files changed

+87
-51
lines changed

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

File renamed without changes.

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

File renamed without changes.

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

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,35 @@ EOF
6363

6464
function arkctl_module_biz_install_test() {
6565
bizName=$1
66-
bizDir=$2
66+
bizVersion=$2
67+
bizDir=$3
68+
69+
arkctl deploy $bizDir
70+
arkStatus=$(arkctl status)
71+
# 提取数据部分
72+
data=$(echo $arkStatus | awk -F "QueryAllBiz " '{print $2}')
73+
# 校验状态
74+
if echo $data | grep -q "\"bizName\":\"$bizName\",\"bizState\":\"ACTIVATED\""; then
75+
echo "biz $bizName install success"
76+
else
77+
echo "biz $bizName install failed：$arkStatus"
78+
exit 1
79+
fi
80+
# 卸载模块
81+
uninstallResult=$(curl --location 'http://localhost:1238/uninstallBiz' \
82+
--header 'Content-Type: application/json' \
83+
--data "{
84+
\"bizName\":\"$bizName\",
85+
\"bizVersion\":\"$bizVersion\"
86+
}")
87+
# 校验卸载
88+
if echo $uninstallResult | grep -q "Uninstall biz: $bizName:$bizVersion success."; then
89+
echo "biz $bizName unInstall success"
90+
else
91+
echo "biz $bizName unInstall failed：$uninstallResult"
92+
exit 1
93+
fi
94+
# 2次安装
6795
arkctl deploy $bizDir
6896
arkStatus=$(arkctl status)
6997
# 提取数据部分
@@ -85,20 +113,17 @@ cd $BaseDir/..
85113
BIZ_INSTALL_URL="http://localhost:8080/module/install"
86114
BIZ_LIST_URL="http://localhost:8080/module/list"
87115

88-
for moduleBootDir in $(find $(pwd) -type d -path "*/biz[1-9]" -o -path "*/*biz" |grep -v src|grep -v target|grep -v log);do
116+
for moduleBootDir in $(find $(pwd) -type d -path "*/biz[1-9]" -o -path "*/*biz" |grep -v src|grep -v target|grep -v logs);do
89117
echo "start deploy $moduleBootDir"
90118
cd $moduleBootDir
91119

92120
echo "找到$(find $(pwd) -name "*-ark-biz.jar" | wc -l)个模块！"
93121
for moduleJar in $(find $(pwd) -name "*-ark-biz.jar");do
94-
if echo "$moduleJar" | grep -q "redis-biz-bootstrap";then
95-
moduleName=$(echo $moduleJar |awk -F "target/redis-" '{print $2}' |awk -F "-" '{print $1}')
96-
else
97-
moduleName=$(echo $moduleJar |awk -F "target/" '{print $2}' |awk -F "-" '{print $1}')
98-
fi
99-
echo "find one module:$moduleName, jar:$moduleJar"
122+
moduleName=$(echo $moduleJar |awk -F "target/" '{print $2}' | sed -e 's/-[0-9].*$//')
123+
moduleVersion=$(echo "$moduleJar" | sed "s/.*$moduleName-\(.*\)-ark-biz.jar/\1/")
124+
echo "find one module, moduleName:$moduleName,moduleVersion:$moduleVersion, jar:$moduleJar"
100125
echo ''>test_output.txt
101-
arkctl_module_biz_install_test ${moduleName} $moduleJar
126+
arkctl_module_biz_install_test ${moduleName} ${moduleVersion} $moduleJar
102127
# echo "start check module install result "
103128
# cat test_output.txt|while read line;do
104129
# if [[ $line =~ "failed" ]];then

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ function kill_java_process() {
2424
set -e
2525

2626
#dobbo common-model
27+
ROOTDir=$(pwd)
2728
testSuite=$1
2829
echo "start testsuite:$testSuite"
2930
if [[ $testSuite == "jdk8" ]];then
@@ -38,7 +39,7 @@ for TEST_DIR in $(find $(pwd) -name "$suiteReg");do
3839
TESTAPP_DIR=$TEST_DIR
3940
echo "TESTAPP_DIR=$TESTAPP_DIR"
4041
cd ${TESTAPP_DIR}
41-
mvn clean install -U -Dmaven.test.skip=true >>/tmp/mvn.out
42+
mvn clean install -U -Dmaven.test.skip=true
4243
for BaseDir in $( find $(pwd) -type d -name "*base" |grep -v src|grep -v target|grep -v mybatis|grep -v logs);do
4344
echo "BaseDir $BaseDir"
4445
export BaseDir=$BaseDir
@@ -57,10 +58,10 @@ for TEST_DIR in $(find $(pwd) -name "$suiteReg");do
5758
sleep 5
5859

5960
echo "Start health check"
60-
bash $TESTAPP_DIR/../ccbin/healthcheck.sh
61+
bash $ROOTDir/.github/workflows/ccbin/healthcheck.sh
6162

6263
echo "Start module biz Test"
63-
bash $TESTAPP_DIR/../ccbin/moduletest.sh
64+
bash $ROOTDir/.github/workflows/ccbin/moduletest.sh
6465

6566
echo "测试通过 $BaseDir"
6667

‎.github/workflows/serverless_runtime_release.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ jobs:
3434
run: |
3535
serverless_runtime_version=`egrep "<revision.default>([^<]+)</revision.default>" sofa-serverless-runtime/pom.xml |awk -F "revision.default>|</revision.default" '{print $2}'`
3636
echo "升级sofa-runtime version to $serverless_runtime_version"
37-
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
37+
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
38+
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
3839
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
3940
4041
- name: Test Env prepare
@@ -47,7 +48,7 @@ jobs:
4748
docker run -p 2181:2181 -it --name zookeeper --restart always -d zookeeper:3.9.0
4849
sudo apt-get install redis-server -y
4950
sudo systemctl start redis-server
50-
sudo cp samples/ccbin/arkctl /usr/bin/arkctl
51+
sudo cp .github/workflows/ccbin/arkctl /usr/bin/arkctl
5152
5253
- name: Run jdk8 serverless runtime test
5354
run: |
@@ -61,6 +62,10 @@ jobs:
6162
distribution: 'temurin'
6263
cache: maven
6364

65+
- name: Build with Maven
66+
working-directory: sofa-serverless-runtime
67+
run: mvn clean install -P17-release -DskipTests -B -U -e && sh ./check_format.sh
68+
6469
- name: Run jdk17 serverless runtime test
6570
run: |
6671
set -e

‎.github/workflows/serverless_runtime_snapshot.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ jobs:
3434
run: |
3535
serverless_runtime_version=`egrep "<revision.default>([^<]+)</revision.default>" sofa-serverless-runtime/pom.xml |awk -F "revision.default>|</revision.default" '{print $2}'`
3636
echo "升级sofa-runtime version to $serverless_runtime_version"
37-
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
37+
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
38+
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
3839
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
3940
4041
- name: Test Env prepare
@@ -47,12 +48,12 @@ jobs:
4748
docker run -p 2181:2181 -it --name zookeeper --restart always -d zookeeper:3.9.0
4849
sudo apt-get install redis-server -y
4950
sudo systemctl start redis-server
50-
sudo cp samples/ccbin/arkctl /usr/bin/arkctl
51+
sudo cp .github/workflows/ccbin/arkctl /usr/bin/arkctl
5152
5253
- name: Run jdk8 serverless runtime test
5354
run: |
5455
set -e
55-
bash samples/ccbin/start.sh jdk8
56+
bash .github/workflows/ccbin/start.sh jdk8
5657
5758
- name: Set up JDK 17
5859
uses: actions/setup-java@v3
@@ -61,10 +62,14 @@ jobs:
6162
distribution: 'temurin'
6263
cache: maven
6364

65+
- name: Build with Maven
66+
working-directory: sofa-serverless-runtime
67+
run: mvn clean install -P17-release -DskipTests -B -U -e
68+
6469
- name: Run jdk17 serverless runtime test
6570
run: |
6671
set -e
67-
bash samples/ccbin/start.sh jdk17
72+
bash .github/workflows/ccbin/start.sh jdk17
6873
6974
release_for_jdk8:
7075
needs: build_and_test

‎samples/dubbo-samples/rpc/dubbo26/dubbo26biz/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<configuration>
7070
<skipArkExecutable>true</skipArkExecutable>
7171
<outputDirectory>./target</outputDirectory>
72-
<bizName>biz</bizName>
72+
<bizName>dubbo26biz</bizName>
7373
<webContextPath>biz</webContextPath>
7474
<declaredMode>true</declaredMode>
7575
</configuration>

‎samples/dubbo-samples/rpc/dubbo26/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dubbo.version>2.6.4</dubbo.version>
2121
<spring.boot.version>2.7.16</spring.boot.version>
2222
<sofa.ark.version>2.2.4</sofa.ark.version>
23-
<sofa.serverless.runtime.version>0.5.4</sofa.serverless.runtime.version>
23+
<sofa.serverless.runtime.version>0.5.3</sofa.serverless.runtime.version>
2424
<disruptor.version>3.4.2</disruptor.version>
2525
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
2626
</properties>

‎samples/dubbo-samples/rpc/dubbo3/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2323
<spring.boot.version>2.7.16</spring.boot.version>
2424
<sofa.ark.version>2.2.4</sofa.ark.version>
25-
<sofa.serverless.runtime.version>0.5.4</sofa.serverless.runtime.version>
25+
<sofa.serverless.runtime.version>0.5.3</sofa.serverless.runtime.version>
2626
<disruptor.version>3.4.2</disruptor.version>
2727
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
2828
<dubbo.version>3.1.11</dubbo.version>

‎samples/sofaboot-samples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<properties>
2323
<java.version>1.8</java.version>
2424
<sofa.ark.version>2.2.4</sofa.ark.version>
25-
<sofa.serverless.runtime.version>0.5.4</sofa.serverless.runtime.version>
25+
<sofa.serverless.runtime.version>0.5.3</sofa.serverless.runtime.version>
2626
<curator.version>2.9.1</curator.version>
2727
<mybatis.version>1.3.2</mybatis.version>
2828
<mysql.version>5.1.46</mysql.version>

0 commit comments

Comments
 (0)