From 3a4c48c45aeefd270506d0a4536401a2c85170da Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Wed, 10 Jan 2024 13:31:04 -0500 Subject: [PATCH 1/2] Excuded jdk_security_infra tests Signed-off-by: Sophia Guo --- openjdk/excludes/ProblemList_openjdk11-openj9.txt | 10 ---------- openjdk/excludes/ProblemList_openjdk11.txt | 9 --------- openjdk/excludes/ProblemList_openjdk17-openj9.txt | 11 ++--------- openjdk/excludes/ProblemList_openjdk17.txt | 9 --------- openjdk/excludes/ProblemList_openjdk21-openj9.txt | 14 -------------- openjdk/excludes/ProblemList_openjdk21.txt | 10 ---------- openjdk/excludes/ProblemList_openjdk22-openj9.txt | 13 ------------- openjdk/excludes/ProblemList_openjdk22.txt | 11 ----------- openjdk/excludes/ProblemList_openjdk23-openj9.txt | 13 ------------- openjdk/excludes/ProblemList_openjdk23.txt | 9 --------- openjdk/playlist.xml | 8 +++----- 11 files changed, 5 insertions(+), 112 deletions(-) diff --git a/openjdk/excludes/ProblemList_openjdk11-openj9.txt b/openjdk/excludes/ProblemList_openjdk11-openj9.txt index 819e69307b..c1b29a350b 100644 --- a/openjdk/excludes/ProblemList_openjdk11-openj9.txt +++ b/openjdk/excludes/ProblemList_openjdk11-openj9.txt @@ -307,16 +307,6 @@ sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java https://gith # jdk_security_infra -security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all - - ############################################################################ # jdk_sound diff --git a/openjdk/excludes/ProblemList_openjdk11.txt b/openjdk/excludes/ProblemList_openjdk11.txt index da17ac7714..281c4456fd 100644 --- a/openjdk/excludes/ProblemList_openjdk11.txt +++ b/openjdk/excludes/ProblemList_openjdk11.txt @@ -214,15 +214,6 @@ sun/security/pkcs11/Secmod/AddTrustedCert.java https://github.com/adoptium/aqa-t # jdk_security_infra -security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all - ############################################################################ # jdk_sound diff --git a/openjdk/excludes/ProblemList_openjdk17-openj9.txt b/openjdk/excludes/ProblemList_openjdk17-openj9.txt index 2724ab6941..c7d9cc73f1 100644 --- a/openjdk/excludes/ProblemList_openjdk17-openj9.txt +++ b/openjdk/excludes/ProblemList_openjdk17-openj9.txt @@ -1,3 +1,5 @@ + + ############################################################################ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -337,15 +339,6 @@ sun/security/krb5/auto/NoAddresses.java https://github.com/adoptium/aqa-tests/is # jdk_security_infra -security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all - ###################################################################################################### # jdk_sound diff --git a/openjdk/excludes/ProblemList_openjdk17.txt b/openjdk/excludes/ProblemList_openjdk17.txt index cff85c677f..85586c4c7a 100644 --- a/openjdk/excludes/ProblemList_openjdk17.txt +++ b/openjdk/excludes/ProblemList_openjdk17.txt @@ -230,15 +230,6 @@ sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java https://github.com/adoptium/aq # jdk_security_infra -security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all - ######################################################################################################################################################## # jdk_sound diff --git a/openjdk/excludes/ProblemList_openjdk21-openj9.txt b/openjdk/excludes/ProblemList_openjdk21-openj9.txt index 7d3a4d7f38..11e9daba31 100644 --- a/openjdk/excludes/ProblemList_openjdk21-openj9.txt +++ b/openjdk/excludes/ProblemList_openjdk21-openj9.txt @@ -349,10 +349,6 @@ java/security/SecureRandom/ApiTest.java https://github.com/eclipse-openj9/openj9 java/security/SecureRandom/EnoughSeedTest.java https://github.com/eclipse-openj9/openj9/issues/16734 windows-all java/security/Signature/ResetAfterException.java https://github.com/eclipse-openj9/openj9/issues/12807 windows-all java/security/Signature/SignatureLength.java https://github.com/eclipse-openj9/openj9/issues/12807 windows-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all ############################################################################ @@ -402,16 +398,6 @@ sun/security/krb5/auto/Cleaners.java https://github.com/eclipse-openj9/openj9/is # jdk_security_infra -security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all - ######################################################################################################################################################## # jdk_sound diff --git a/openjdk/excludes/ProblemList_openjdk21.txt b/openjdk/excludes/ProblemList_openjdk21.txt index bc60e2b000..0bc0f040dd 100644 --- a/openjdk/excludes/ProblemList_openjdk21.txt +++ b/openjdk/excludes/ProblemList_openjdk21.txt @@ -283,16 +283,6 @@ sun/security/krb5/auto/Cleaners.java https://github.com/adoptium/aqa-tests/issue # jdk_security_infra -security/infra/java/security/cert/CertPathValidator/certification/GoogleCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all - ############################################################################ # jdk_sound diff --git a/openjdk/excludes/ProblemList_openjdk22-openj9.txt b/openjdk/excludes/ProblemList_openjdk22-openj9.txt index 2dd79e495a..3cf454ef32 100644 --- a/openjdk/excludes/ProblemList_openjdk22-openj9.txt +++ b/openjdk/excludes/ProblemList_openjdk22-openj9.txt @@ -350,10 +350,6 @@ java/security/SecureRandom/ApiTest.java https://github.com/eclipse-openj9/openj9 java/security/SecureRandom/EnoughSeedTest.java https://github.com/eclipse-openj9/openj9/issues/16734 windows-all java/security/Signature/ResetAfterException.java https://github.com/eclipse-openj9/openj9/issues/12807 windows-all java/security/Signature/SignatureLength.java https://github.com/eclipse-openj9/openj9/issues/12807 windows-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all ############################################################################ @@ -403,15 +399,6 @@ sun/security/krb5/auto/Cleaners.java https://github.com/eclipse-openj9/openj9/is # jdk_security_infra -security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all - ######################################################################################################################################################## # jdk_sound diff --git a/openjdk/excludes/ProblemList_openjdk22.txt b/openjdk/excludes/ProblemList_openjdk22.txt index b1f71e8fa6..afb9b19e32 100644 --- a/openjdk/excludes/ProblemList_openjdk22.txt +++ b/openjdk/excludes/ProblemList_openjdk22.txt @@ -260,8 +260,6 @@ java/nio/channels/DatagramChannel/PromiscuousIPv6.java https://github.com/adopti # jdk_security -sun/security/ssl/SSLSocketImpl/SSLSocketLeak.java https://github.com/adoptium/aqa-tests/issues/3811 windows-x86 - ############################################################################ # jdk_security3 @@ -282,15 +280,6 @@ sun/security/krb5/auto/Cleaners.java https://github.com/adoptium/aqa-tests/issue # jdk_security_infra -security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all - ############################################################################ # jdk_sound diff --git a/openjdk/excludes/ProblemList_openjdk23-openj9.txt b/openjdk/excludes/ProblemList_openjdk23-openj9.txt index 2dd79e495a..3cf454ef32 100644 --- a/openjdk/excludes/ProblemList_openjdk23-openj9.txt +++ b/openjdk/excludes/ProblemList_openjdk23-openj9.txt @@ -350,10 +350,6 @@ java/security/SecureRandom/ApiTest.java https://github.com/eclipse-openj9/openj9 java/security/SecureRandom/EnoughSeedTest.java https://github.com/eclipse-openj9/openj9/issues/16734 windows-all java/security/Signature/ResetAfterException.java https://github.com/eclipse-openj9/openj9/issues/12807 windows-all java/security/Signature/SignatureLength.java https://github.com/eclipse-openj9/openj9/issues/12807 windows-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all ############################################################################ @@ -403,15 +399,6 @@ sun/security/krb5/auto/Cleaners.java https://github.com/eclipse-openj9/openj9/is # jdk_security_infra -security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all - ######################################################################################################################################################## # jdk_sound diff --git a/openjdk/excludes/ProblemList_openjdk23.txt b/openjdk/excludes/ProblemList_openjdk23.txt index b1f71e8fa6..3591fc88f2 100644 --- a/openjdk/excludes/ProblemList_openjdk23.txt +++ b/openjdk/excludes/ProblemList_openjdk23.txt @@ -282,15 +282,6 @@ sun/security/krb5/auto/Cleaners.java https://github.com/adoptium/aqa-tests/issue # jdk_security_infra -security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java https://bugs.openjdk.org/browse/JDK-8309088 generic-all -security/infra/java/security/cert/CertPathValidator/certification/LuxTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/QuoVadisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/EntrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/DTrustCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/HaricaCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all -security/infra/java/security/cert/CertPathValidator/certification/ActalisCA.java https://github.com/adoptium/aqa-tests/issues/2074 generic-all - ############################################################################ # jdk_sound diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml index b9956cd52c..857c85466d 100644 --- a/openjdk/playlist.xml +++ b/openjdk/playlist.xml @@ -1877,6 +1877,9 @@ openj9 fips140_2 + + https://github.com/adoptium/aqa-tests/issues/4808 + Mode150 @@ -1898,11 +1901,6 @@ extended - - hotspot - openj9 - ibm - openjdk From 363e9a78779a1556e8216520905d3a966571f455 Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Thu, 11 Jan 2024 10:18:44 -0500 Subject: [PATCH 2/2] Keep for z/os Signed-off-by: Sophia Guo --- openjdk/playlist.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/openjdk/playlist.xml b/openjdk/playlist.xml index 857c85466d..045d7b9ec4 100644 --- a/openjdk/playlist.xml +++ b/openjdk/playlist.xml @@ -1905,6 +1905,34 @@ openjdk + + jdk_security_infra_zos + + Mode150 + Mode650 + Mode1000 + + $(JAVA_COMMAND) -Xmx512m -jar $(Q)$(TEST_RESROOT)$(D)jtreg$(D)lib$(D)jtreg.jar$(Q) \ + $(JTREG_BASIC_OPTIONS) $(JDK_NATIVE_OPTIONS) -vmoptions:$(Q)-Xmx512m $(JVM_OPTIONS) $(VMOPTION_HEADLESS)$(Q) \ + $(TIMEOUT_HANDLER) \ + -w $(Q)$(REPORTDIR)$(D)work$(Q) \ + -r $(Q)$(REPORTDIR)$(D)report$(Q) \ + -jdk:$(Q)$(TEST_JDK_HOME)$(Q) \ + -exclude:$(Q)$(JTREG_JDK_TEST_DIR)$(D)ProblemList.txt$(Q) \ + -exclude:$(Q)$(TEST_RESROOT)$(D)$(PROBLEM_LIST_FILE)$(Q) \ + ${FEATURE_PROBLEM_LIST_FILE} \ + ${VENDOR_PROBLEM_LIST_FILE} \ + $(Q)$(JTREG_JDK_TEST_DIR):jdk_security_infra$(Q); \ + $(TEST_STATUS) + + extended + + os.zos + + openjdk + + + jdk_native_sanity