Enabling java_net tests on all releases except jck11 z/OS

adoptium · May 25, 2022 · 0df030f · 0df030f
1 parent 4e20b33
commit 0df030f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 32 deletions.
diff --git a/jck/jtrunner/config/default/jcktest.properties b/jck/jtrunner/config/default/jcktest.properties
@@ -11,8 +11,8 @@ testhost1name=ci.adoptopenjdk.net
 testhost1ip=78.47.239.97
 testhost2name=hg.openjdk.java.net
 testhost2ip=137.254.56.63
-httpurl=http://openjdk.java.net/index.html
-ftpurl=ftp\://jckftp\:CqwbpqMpe4Q68kDRXj4mqxM7W@jckservices.adoptium.net/filename.txt
+httpurl=http://rtsvc-linux4-ubu20-1.fyre.ibm.com/index.html
+ftpurl=ftp\://testuser\:Rtsvc21\=Cushion@rtsvc-linux4-ubu20-1.fyre.ibm.com/smit.log
 krb5ClientPassword=user1
 krb5ClientUsername=user1
 krb5ServerPassword=user2

diff --git a/jck/jtrunner/config/jck11/runtime.jti b/jck/jtrunner/config/jck11/runtime.jti
@@ -142,7 +142,7 @@ jck.env.runtime.testExecute.verify=-Xfuture
 # jck.env.runtime.url.fileURL example: file\:///home/user/urlfile.txt
 jck.env.runtime.url.fileURL=will_be_set_by_test_automation_at_run_time
 # jck.env.runtime.url.ftpURL example: ftp\://user\:password@xxxx.xxxx.xxxx.com/xxx.txt
-jck.env.runtime.url.ftpURL=ftp\://jckftp\:CqwbpqMpe4Q68kDRXj4mqxM7W@jckservices.adoptium.net/filename.txt
+jck.env.runtime.url.ftpURL=ftp\://testuser\:Rtsvc21\=Cushion@rtsvc-linux4-ubu20-1.fyre.ibm.com/smit.log
 # jck.env.runtime.url.httpURL example: http\://xxxx.xxxx.xxxx.com/index.html
 jck.env.runtime.url.httpURL=will_be_set_by_test_automation_at_run_time
 jck.env.runtime.url=Yes

diff --git a/jck/jtrunner/config/jck17/runtime.jti b/jck/jtrunner/config/jck17/runtime.jti
@@ -142,7 +142,7 @@ jck.env.runtime.testExecute.verify=-Xfuture
 # jck.env.runtime.url.fileURL example: file\:///home/user/urlfile.txt
 jck.env.runtime.url.fileURL=will_be_set_by_test_automation_at_run_time
 # jck.env.runtime.url.ftpURL example: ftp\://user\:password@xxxx.xxxx.xxxx.com/xxx.txt
-jck.env.runtime.url.ftpURL=ftp\://jckftp\:CqwbpqMpe4Q68kDRXj4mqxM7W@jckservices.adoptium.net/filename.txt
+jck.env.runtime.url.ftpURL=ftp\://testuser\:Rtsvc21\=Cushion@rtsvc-linux4-ubu20-1.fyre.ibm.com/smit.log
 # jck.env.runtime.url.httpURL example: http\://xxxx.xxxx.xxxx.com/index.html
 jck.env.runtime.url.httpURL=will_be_set_by_test_automation_at_run_time
 jck.env.runtime.url=Yes

diff --git a/jck/jtrunner/config/jck8c/runtime.jti b/jck/jtrunner/config/jck8c/runtime.jti
@@ -196,7 +196,7 @@ jck.env.runtime.url=Yes
 # jck.env.runtime.url.fileURL example: file\:///home/user/urlfile.txt
 jck.env.runtime.url.fileURL=will_be_set_by_test_automation_at_run_time
 # jck.env.runtime.url.ftpURL example: ftp\://user\:password@xxxx.xxxx.xxxx.com/xxx.txt
-jck.env.runtime.url.ftpURL=ftp\://jckftp\:CqwbpqMpe4Q68kDRXj4mqxM7W@jckservices.adoptium.net/filename.txt
+jck.env.runtime.url.ftpURL=ftp\://testuser\:Rtsvc21\=Cushion@rtsvc-linux4-ubu20-1.fyre.ibm.com/smit.log
 # jck.env.runtime.url.httpURL example: http\://xxxx.xxxx.xxxx.com/index.html
 jck.env.runtime.url.httpURL=will_be_set_by_test_automation_at_run_time
 jck.env.simpleOrAdvanced=advanced

diff --git a/jck/runtime.api/playlist.xml b/jck/runtime.api/playlist.xml
@@ -581,33 +581,7 @@
 		<disables>
 			<disable>
 				<comment>Disabled on all platforms due to backlog/issues/462. Awaiting some automation improvements, in the interim these targets will be run manually</comment>
-				<version>11</version>
-				<impl>ibm</impl>
-			</disable>
-			<disable>
-				<comment>Disabled on all platforms due to backlog/issues/462. Awaiting some automation improvements, in the interim these targets will be run manually</comment>
-				<version>16+</version>
-				<impl>ibm</impl>
-			</disable>
-			<disable>
-				<comment>Disabled on all platforms due to backlog/issues/462. Awaiting some automation improvements, in the interim these targets will be run manually</comment>
-				<version>8</version>
-				<impl>ibm</impl>
-			</disable>
-			<disable>
-				<comment>Disabled on all platforms due to backlog/issues/462. Awaiting some automation improvements, in the interim these targets will be run manually</comment>
-				<version>11</version>
-				<impl>openj9</impl>
-			</disable>
-			<disable>
-				<comment>Disabled on all platforms due to backlog/issues/462. Awaiting some automation improvements, in the interim these targets will be run manually</comment>
-				<version>16+</version>
-				<impl>openj9</impl>
-			</disable>
-			<disable>
-			<comment>Disabled on all platforms due to backlog/issues/462. Awaiting some automation improvements, in the interim these targets will be run manually</comment>
-			<version>8</version>
-			<impl>openj9</impl>
+				<platform>.*zos.*</platform>
 			</disable>
 		</disables>
 		<variations>