optimize: add independent nacos for the CI process. (#6836)

apache · Sep 10, 2024 · fde59c1 · fde59c1
1 parent f2577cf
commit fde59c1
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,6 +16,14 @@ jobs:
         ports:
           - 6379:6379
         options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      nacos:
+        image: nacos/nacos-server:v2.4.2
+        ports:
+          - 8848:8848
+        env:
+          MODE: standalone
+          SPRING_SECURITY_ENABLED: false
+        options: --health-cmd="curl -f http://localhost:8848/nacos" --health-interval=10s --health-timeout=5s --health-retries=3 --health-start-period=30s
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
@@ -87,6 +87,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#6808](https://github.com/apache/incubator-seata/pull/6808)] change version to 2.2.0-SNAPSHOT
 - [[#6819](https://github.com/apache/incubator-seata/pull/6819)] merge the packaging processes of namingserver and seata-server
 - [[#6827](https://github.com/apache/incubator-seata/pull/6827)] rename namingserver registry type
+- [[#6836](https://github.com/apache/incubator-seata/pull/6836)] add independent nacos for the CI process
 
 
 ### refactor:
@@ -137,5 +138,6 @@ Thanks to these contributors for their code commits. Please report an unintended
 - [xingfudeshi](https://github.com/xingfudeshi)
 - [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
 - [LegGasai](https://github.com/LegGasai)
+- [yangli-stu](https://github.com/yangli-stu)
 
 Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
@@ -87,6 +87,7 @@
 - [[#6808](https://github.com/apache/incubator-seata/pull/6808)] 修改版本号为2.2.0-SNAPSHOT
 - [[#6819](https://github.com/apache/incubator-seata/pull/6819)] namingserver与server的合并打包
 - [[#6827](https://github.com/apache/incubator-seata/pull/6827)] 重命名namingserver注册类型改为seata
+- [[#6836](https://github.com/apache/incubator-seata/pull/6836)] 为CI流程增加独立nacos
 
 
 ### refactor:
@@ -138,6 +139,7 @@
 - [xingfudeshi](https://github.com/xingfudeshi)
 - [xiaoxiangyeyu0](https://github.com/xiaoxiangyeyu0)
 - [LegGasai](https://github.com/LegGasai)
+- [yangli-stu](https://github.com/yangli-stu)
 
 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
 
diff --git a/config/seata-config-nacos/src/test/java/org/apache/seata/config/nacos/NacosMockTest.java b/config/seata-config-nacos/src/test/java/org/apache/seata/config/nacos/NacosMockTest.java
@@ -40,7 +40,7 @@
 
 public class NacosMockTest {
     private static ConfigService configService;
-    private static final String NACOS_ENDPOINT = "console.nacos.io:80";
+    private static final String NACOS_ENDPOINT = "127.0.0.1:8848";
 
     private static final String NACOS_GROUP = "SEATA_GROUP";
 

diff --git a/config/seata-config-nacos/src/test/resources/registry-mock.conf b/config/seata-config-nacos/src/test/resources/registry-mock.conf
@@ -21,7 +21,7 @@ registry {
 
   nacos {
     application = "seata-server"
-    serverAddr = "console.nacos.io:80"
+    serverAddr = "127.0.0.1:8848"
     group = "SEATA_GROUP"
     namespace = ""
     username = ""
@@ -77,7 +77,7 @@ config {
   type = "nacos"
 
   nacos {
-      serverAddr = "console.nacos.io:80"
+      serverAddr = "127.0.0.1:8848"
       namespace = ""
       group = "SEATA_GROUP"
       dataId = "seata-mock"

diff --git a/config/seata-config-nacos/src/test/resources/registry-test.conf b/config/seata-config-nacos/src/test/resources/registry-test.conf
@@ -89,7 +89,7 @@ config {
     dataId = "seata.properties"
   }
   test {
-      serverAddr = "console.nacos.io:80"
+      serverAddr = "127.0.0.1:8848"
       namespace = ""
       group = "SEATA_GROUP"
       dataId = ""

diff --git a/config/seata-config-nacos/src/test/resources/registry.conf b/config/seata-config-nacos/src/test/resources/registry.conf
@@ -21,7 +21,7 @@ registry {
 
   nacos {
     application = "seata-server"
-    serverAddr = "console.nacos.io:80"
+    serverAddr = "127.0.0.1:8848"
     group = "SEATA_GROUP"
     namespace = ""
     username = ""