GEODE-8730: don't bind to ephemeral ports in test

shangtian-tuzhi · Dec 3, 2020 · 4e206f0 · 4e206f0
1 parent f6ee107
commit 4e206f0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/docker-compose.yml b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/docker-compose.yml
@@ -22,7 +22,8 @@ services:
     hostname: geode
     expose:
       - '10334'
-      - '40404'
+      - '8501'
+      - '8502'
     entrypoint: 'sh'
     command: '-c /geode/scripts/forever'
     networks:

diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/haproxy.cfg b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/haproxy.cfg
@@ -37,8 +37,8 @@ backend locators-maeve
 
 backend servers-dolores
   mode tcp
-  server server1 geode:40404
+  server server1 geode:8501
 
 backend servers-clementine
   mode tcp
-  server server1 geode:40405
+  server server1 geode:8502
diff --git a/...bly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter-2.gfsh b/...bly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter-2.gfsh
@@ -16,8 +16,8 @@
 #
 
 start locator --name=locator-maeve --connect=false --redirect-output --hostname-for-clients=locator-maeve --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/locator-maeve-keystore.jks
-start server --name=server-dolores --group=group-dolores --hostname-for-clients=server-dolores --locators=geode[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-dolores-keystore.jks
-start server --name=server-clementine --group=group-clementine --hostname-for-clients=server-clementine --server-port=40405 --locators=geode[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-clementine-keystore.jks
+start server --name=server-dolores --group=group-dolores --hostname-for-clients=server-dolores --server-port=8501 --locators=geode[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-dolores-keystore.jks
+start server --name=server-clementine --group=group-clementine --hostname-for-clients=server-clementine --server-port=8502 --locators=geode[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-clementine-keystore.jks
 connect --locator=geode[10334] --use-ssl=true --security-properties-file=/geode/config/gfsecurity.properties
 create region --name=region-dolores --group=group-dolores --type=REPLICATE
 create region --name=region-clementine --group=group-clementine --type=REPLICATE
diff --git a/...embly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter.gfsh b/...embly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter.gfsh
@@ -16,7 +16,7 @@
 #
 
 start locator --name=locator-maeve --connect=false --hostname-for-clients=locator-maeve --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/locator-maeve-keystore.jks
-start server --name=server-dolores --max-heap=256m --hostname-for-clients=server-dolores --locators=geode[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-dolores-keystore.jks
+start server --name=server-dolores --max-heap=256m --hostname-for-clients=server-dolores --server-port=8501 --locators=geode[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-dolores-keystore.jks
 connect --locator=geode[10334] --use-ssl=true --security-properties-file=/geode/config/gfsecurity.properties
 create region --name=jellyfish --type=REPLICATE