#23507 Tests - using ports set from the environment

eclipse-ee4j · Mar 3, 2022 · a21c7ae · a21c7ae
1 parent 05fb554
commit a21c7ae
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/appserver/tests/appserv-tests/devtests/cdi/config/das-config.properties b/appserver/tests/appserv-tests/devtests/cdi/config/das-config.properties
@@ -23,10 +23,10 @@ admin.domain=domain1
 admin.domain.dir=${env.S1AS_HOME}/domains
 activeconsumer.maxnum=1
 mail.host="ha21sca.sfbay.sun.com"
-http.port=8080
+http.port=${env.PORT_HTTP}
 http.host=localhost
 https.host=localhost
-https.port=8181
+https.port=${env.PORT_HTTPS}
 orb.port=3700
 admin.password=admin123
 master.password=admin123

diff --git a/appserver/tests/appserv-tests/devtests/cdi/config/pe-config.properties b/appserver/tests/appserv-tests/devtests/cdi/config/pe-config.properties
@@ -14,19 +14,18 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
-
 execution.mode=pe
-admin.port=4848
+admin.port=${env.PORT_ADMIN}
 admin.user=admin
 admin.host=localhost
 admin.domain=domain1
 admin.domain.dir=${env.S1AS_HOME}/domains
 activeconsumer.maxnum=1
 mail.host="ha21sca.sfbay.sun.com"
-http.port=8080
+http.port=${env.PORT_HTTP}
 http.host=localhost
 https.host=localhost
-https.port=8181
+https.port=${env.PORT_HTTPS}
 orb.port=3700
 admin.password=adminadmin
 master.password=changeit

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/config/das-config.properties b/appserver/tests/appserv-tests/devtests/jdbc/config/das-config.properties
@@ -22,10 +22,10 @@ admin.domain=domain1
 admin.domain.dir=${env.S1AS_HOME}/domains
 activeconsumer.maxnum=1
 mail.host="ha21sca.sfbay.sun.com"
-http.port=8080
+http.port=${env.PORT_HTTP}
 http.host=localhost
 https.host=localhost
-https.port=8181
+https.port=${env.PORT_HTTPS}
 orb.port=3700
 admin.password=admin123
 appserver.instance.name=server

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/config/pe-config.properties b/appserver/tests/appserv-tests/devtests/jdbc/config/pe-config.properties
@@ -15,17 +15,17 @@
 #
 
 execution.mode=pe
-admin.port=4848
+admin.port=${env.PORT_ADMIN}
 admin.user=admin
 admin.host=localhost
 admin.domain=domain1
 admin.domain.dir=${env.S1AS_HOME}/domains
 activeconsumer.maxnum=1
 mail.host="ha21sca.sfbay.sun.com"
-http.port=8080
+http.port=${env.PORT_HTTP}
 http.host=localhost
 https.host=localhost
-https.port=8181
+https.port=${env.PORT_HTTPS}
 orb.port=3700
 admin.password=admin123
 appserver.instance.name=server