diff --git a/x-pack/qa/kerberos-tests/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosAuthenticationIT.java b/x-pack/qa/kerberos-tests/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosAuthenticationIT.java index 34aec450cf1..e94a133ff32 100644 --- a/x-pack/qa/kerberos-tests/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosAuthenticationIT.java +++ b/x-pack/qa/kerberos-tests/src/test/java/org/elasticsearch/xpack/security/authc/kerberos/KerberosAuthenticationIT.java @@ -8,7 +8,6 @@ package org.elasticsearch.xpack.security.authc.kerberos; import org.apache.http.HttpEntity; import org.apache.http.HttpHost; -import org.elasticsearch.bootstrap.JavaVersion; import org.elasticsearch.client.Request; import org.elasticsearch.client.Response; import org.elasticsearch.client.RestClient; @@ -90,13 +89,13 @@ public class KerberosAuthenticationIT extends ESRestTestCase { assertOK(response); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/56507") - public void testSuppressedOnJDK15() { - assumeTrue("AwaitsFix on JDK15", JavaVersion.current().compareTo(JavaVersion.parse("15")) < 0); + // JDK 8u262 shipped with a NPE in Kerberos code, see https://github.com/elastic/elasticsearch/issues/56507 + public void testSuppressedOnJDK8u262() { + assumeFalse("Cannot run on JDK 8u262", "1.8.0_262".equals(System.getProperty("java.version"))); } public void testLoginByKeytab() throws IOException, PrivilegedActionException { - testSuppressedOnJDK15(); + testSuppressedOnJDK8u262(); final String userPrincipalName = System.getProperty(TEST_USER_WITH_KEYTAB_KEY); final String keytabPath = System.getProperty(TEST_USER_WITH_KEYTAB_PATH_KEY); final boolean enabledDebugLogs = Boolean.parseBoolean(System.getProperty(ENABLE_KERBEROS_DEBUG_LOGS_KEY)); @@ -106,7 +105,7 @@ public class KerberosAuthenticationIT extends ESRestTestCase { } public void testLoginByUsernamePassword() throws IOException, PrivilegedActionException { - testSuppressedOnJDK15(); + testSuppressedOnJDK8u262(); final String userPrincipalName = System.getProperty(TEST_USER_WITH_PWD_KEY); final String password = System.getProperty(TEST_USER_WITH_PWD_PASSWD_KEY); final boolean enabledDebugLogs = Boolean.parseBoolean(System.getProperty(ENABLE_KERBEROS_DEBUG_LOGS_KEY)); @@ -116,7 +115,7 @@ public class KerberosAuthenticationIT extends ESRestTestCase { } public void testGetOauth2TokenInExchangeForKerberosTickets() throws PrivilegedActionException, GSSException, IOException { - testSuppressedOnJDK15(); + testSuppressedOnJDK8u262(); final String userPrincipalName = System.getProperty(TEST_USER_WITH_PWD_KEY); final String password = System.getProperty(TEST_USER_WITH_PWD_PASSWD_KEY); final boolean enabledDebugLogs = Boolean.parseBoolean(System.getProperty(ENABLE_KERBEROS_DEBUG_LOGS_KEY));