Merge pull request #206 from SonicCloudOrg/dev

beta_done
SonicCloudOrg · May 20, 2022 · e77b174 · e77b174
2 parents 641e380 + 740d59c
commit e77b174
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/config/application-sonic-agent.yml b/config/application-sonic-agent.yml
@@ -1,9 +1,9 @@
 zookeeper:
-  # zookeeper的ip地址 除了开发环境，不推荐填localhost、127.0.0.1之类的配置
+  # zookeeper的ip地址，对应server的zookeeper，不能填localhost、127.0.0.1之类的无效ipv4
   registry-host: 127.0.0.1
   # zookeeper的端口
   registry-port: 2181
-  # 本机网卡ip地址，开发、生产都禁止填localhost、127.0.0.1之类的配置
+  # 本机网卡ip地址，不能填localhost、127.0.0.1之类的无效ipv4
   instance-host: 192.168.0.2
 
 # 一般不需要改动

diff --git a/plugins/sonic-go-mitmproxy.exe → plugins/sonic-go-mitmproxy b/plugins/sonic-go-mitmproxy.exe → plugins/sonic-go-mitmproxy
diff --git a/plugins/sonic-ios-bridge.exe → plugins/sonic-ios-bridge b/plugins/sonic-ios-bridge.exe → plugins/sonic-ios-bridge
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
@@ -86,4 +86,4 @@ ADD /plugins /root/plugins
 ADD /src/main/docker/config /root/config
 ADD /target/sonic-agent-linux-x86_64.jar /root
 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-ENTRYPOINT ["/root/jdk-17.0.3.1/bin/java","-server","-Dfile.encoding=utf-8","-XX:-UseGCOverheadLimit","-XX:+DisableExplicitGC","-XX:SurvivorRatio=1","-XX:LargePageSizeInBytes=128M","-XX:SoftRefLRUPolicyMSPerMB=0","-Djava.security.egd=file:/dev/./urandom","-jar","sonic-agent-linux-x86_64.jar"]
+ENTRYPOINT ["/root/jdk-17.0.3.1/bin/java","-server","-Dfile.encoding=utf-8","-XX:-UseGCOverheadLimit","-XX:+DisableExplicitGC","-XX:SurvivorRatio=1","-XX:LargePageSizeInBytes=128M","-XX:SoftRefLRUPolicyMSPerMB=0","-Djava.security.egd=file:/dev/./urandom","--add-opens java.base/java.lang=ALL-UNNAMED","--add-opens java.base/java.util=ALL-UNNAMED","--add-opens java.base/java.math=ALL-UNNAMED","-jar","sonic-agent-linux-x86_64.jar"]
diff --git a/src/main/java/org/cloud/sonic/agent/automation/IOSStepHandler.java b/src/main/java/org/cloud/sonic/agent/automation/IOSStepHandler.java
@@ -111,7 +111,7 @@ public void startIOSDriver(String udId, int wdaPort) throws InterruptedException
         desiredCapabilities.setCapability(MobileCapabilityType.NO_RESET, true);
         desiredCapabilities.setCapability(MobileCapabilityType.DEVICE_NAME, SibTool.getName(udId));
         desiredCapabilities.setCapability(MobileCapabilityType.UDID, udId);
-        desiredCapabilities.setCapability("wdaConnectionTimeout", 60000);
+        desiredCapabilities.setCapability("wdaConnectionTimeout", 10000);
         desiredCapabilities.setCapability(IOSMobileCapabilityType.WEB_DRIVER_AGENT_URL, "http://127.0.0.1:" + wdaPort);
         desiredCapabilities.setCapability("useXctestrunFile", false);
         desiredCapabilities.setCapability(IOSMobileCapabilityType.SHOW_IOS_LOG, false);

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -11,4 +11,4 @@ spring:
 sonic:
   saa: 2.0.0
   sgm: 0.1.9
-  sib: 1.0.5
+  sib: 1.0.6