diff --git a/muted-tests.yml b/muted-tests.yml index a193b4535d616..34f4127078ec7 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -140,21 +140,6 @@ tests: - class: org.elasticsearch.xpack.security.authc.service.ServiceAccountIT method: testAuthenticateShouldNotFallThroughInCaseOfFailure issue: https://github.com/elastic/elasticsearch/issues/120902 -- class: org.elasticsearch.packaging.test.DockerTests - method: test050BasicApiTests - issue: https://github.com/elastic/elasticsearch/issues/120911 -- class: org.elasticsearch.packaging.test.DockerTests - method: test140CgroupOsStatsAreAvailable - issue: https://github.com/elastic/elasticsearch/issues/120914 -- class: org.elasticsearch.packaging.test.DockerTests - method: test070BindMountCustomPathConfAndJvmOptions - issue: https://github.com/elastic/elasticsearch/issues/120910 -- class: org.elasticsearch.packaging.test.DockerTests - method: test071BindMountCustomPathWithDifferentUID - issue: https://github.com/elastic/elasticsearch/issues/120918 -- class: org.elasticsearch.packaging.test.DockerTests - method: test171AdditionalCliOptionsAreForwarded - issue: https://github.com/elastic/elasticsearch/issues/120925 - class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT method: test {p0=nodes.stats/11_indices_metrics/indices mappings exact count test for indices level} issue: https://github.com/elastic/elasticsearch/issues/120950 @@ -174,9 +159,6 @@ tests: - class: org.elasticsearch.xpack.ilm.TimeSeriesLifecycleActionsIT method: testHistoryIsWrittenWithFailure issue: https://github.com/elastic/elasticsearch/issues/123203 -- class: org.elasticsearch.packaging.test.DockerTests - method: test151MachineDependentHeapWithSizeOverride - issue: https://github.com/elastic/elasticsearch/issues/123437 - class: org.elasticsearch.action.admin.cluster.node.tasks.CancellableTasksIT method: testChildrenTasksCancelledOnTimeout issue: https://github.com/elastic/elasticsearch/issues/123568 @@ -219,12 +201,6 @@ tests: - class: org.elasticsearch.packaging.test.BootstrapCheckTests method: test10Install issue: https://github.com/elastic/elasticsearch/issues/124957 -- class: org.elasticsearch.packaging.test.DockerTests - method: test011SecurityEnabledStatus - issue: https://github.com/elastic/elasticsearch/issues/124990 -- class: org.elasticsearch.packaging.test.DockerTests - method: test012SecurityCanBeDisabled - issue: https://github.com/elastic/elasticsearch/issues/116636 - class: org.elasticsearch.index.shard.StoreRecoveryTests method: testAddIndices issue: https://github.com/elastic/elasticsearch/issues/124104 @@ -237,9 +213,6 @@ tests: - class: org.elasticsearch.smoketest.MlWithSecurityIT method: test {yaml=ml/data_frame_analytics_cat_apis/Test cat data frame analytics single job with header} issue: https://github.com/elastic/elasticsearch/issues/125642 -- class: org.elasticsearch.packaging.test.DockerTests - method: test010Install - issue: https://github.com/elastic/elasticsearch/issues/125680 - class: org.elasticsearch.xpack.test.rest.XPackRestIT method: test {p0=transform/transforms_start_stop/Test schedule_now on an already started transform} issue: https://github.com/elastic/elasticsearch/issues/120720 @@ -255,9 +228,6 @@ tests: - class: org.elasticsearch.xpack.test.rest.XPackRestIT method: test {p0=transform/transforms_stats/Test get transform stats with timeout} issue: https://github.com/elastic/elasticsearch/issues/125975 -- class: org.elasticsearch.packaging.test.DockerTests - method: test021InstallPlugin - issue: https://github.com/elastic/elasticsearch/issues/116147 - class: org.elasticsearch.action.RejectionActionIT method: testSimulatedSearchRejectionLoad issue: https://github.com/elastic/elasticsearch/issues/125901 @@ -267,9 +237,6 @@ tests: - class: org.elasticsearch.search.basic.SearchWithRandomDisconnectsIT method: testSearchWithRandomDisconnects issue: https://github.com/elastic/elasticsearch/issues/122707 -- class: org.elasticsearch.packaging.test.DockerTests - method: test020PluginsListWithNoPlugins - issue: https://github.com/elastic/elasticsearch/issues/126232 - class: org.elasticsearch.xpack.test.rest.XPackRestIT method: test {p0=transform/transforms_reset/Test force reseting a running transform} issue: https://github.com/elastic/elasticsearch/issues/126240 @@ -279,15 +246,9 @@ tests: - class: org.elasticsearch.xpack.test.rest.XPackRestIT method: test {p0=ml/start_data_frame_analytics/Test start classification analysis when the dependent variable cardinality is too low} issue: https://github.com/elastic/elasticsearch/issues/126299 -- class: org.elasticsearch.packaging.test.DockerTests - method: test023InstallPluginUsingConfigFile - issue: https://github.com/elastic/elasticsearch/issues/126145 - class: org.elasticsearch.smoketest.MlWithSecurityIT method: test {yaml=ml/start_data_frame_analytics/Test start classification analysis when the dependent variable cardinality is too low} issue: https://github.com/elastic/elasticsearch/issues/123200 -- class: org.elasticsearch.packaging.test.DockerTests - method: test022InstallPluginsFromLocalArchive - issue: https://github.com/elastic/elasticsearch/issues/116866 - class: org.elasticsearch.smoketest.MlWithSecurityIT method: test {yaml=ml/trained_model_cat_apis/Test cat trained models} issue: https://github.com/elastic/elasticsearch/issues/125750 @@ -330,15 +291,6 @@ tests: - class: org.elasticsearch.cli.keystore.AddStringKeyStoreCommandTests method: testStdinWithMultipleValues issue: https://github.com/elastic/elasticsearch/issues/126882 -- class: org.elasticsearch.packaging.test.DockerTests - method: test024InstallPluginFromArchiveUsingConfigFile - issue: https://github.com/elastic/elasticsearch/issues/126936 -- class: org.elasticsearch.packaging.test.DockerTests - method: test026InstallBundledRepositoryPlugins - issue: https://github.com/elastic/elasticsearch/issues/127081 -- class: org.elasticsearch.packaging.test.DockerTests - method: test026InstallBundledRepositoryPluginsViaConfigFile - issue: https://github.com/elastic/elasticsearch/issues/127158 - class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS2EnrichUnavailableRemotesIT method: testEsqlEnrichWithSkipUnavailable issue: https://github.com/elastic/elasticsearch/issues/127368 @@ -357,48 +309,18 @@ tests: - class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT method: test {p0=search/350_point_in_time/point-in-time with index filter} issue: https://github.com/elastic/elasticsearch/issues/127741 -- class: org.elasticsearch.packaging.test.DockerTests - method: test025SyncPluginsUsingProxy - issue: https://github.com/elastic/elasticsearch/issues/127138 - class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT method: testOneRemoteClusterPartial issue: https://github.com/elastic/elasticsearch/issues/124055 - class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT method: test {lookup-join.MvJoinKeyOnTheLookupIndex ASYNC} issue: https://github.com/elastic/elasticsearch/issues/128030 -- class: org.elasticsearch.packaging.test.DockerTests - method: test042KeystorePermissionsAreCorrect - issue: https://github.com/elastic/elasticsearch/issues/128018 -- class: org.elasticsearch.packaging.test.DockerTests - method: test072RunEsAsDifferentUserAndGroup - issue: https://github.com/elastic/elasticsearch/issues/128031 -- class: org.elasticsearch.packaging.test.DockerTests - method: test122CanUseDockerLoggingConfig - issue: https://github.com/elastic/elasticsearch/issues/128110 -- class: org.elasticsearch.packaging.test.DockerTests - method: test041AmazonCaCertsAreInTheKeystore - issue: https://github.com/elastic/elasticsearch/issues/128006 -- class: org.elasticsearch.packaging.test.DockerTests - method: test130JavaHasCorrectOwnership - issue: https://github.com/elastic/elasticsearch/issues/128174 -- class: org.elasticsearch.packaging.test.DockerTests - method: test600Interrupt - issue: https://github.com/elastic/elasticsearch/issues/128144 - class: org.elasticsearch.packaging.test.EnrollmentProcessTests method: test20DockerAutoFormCluster issue: https://github.com/elastic/elasticsearch/issues/128113 -- class: org.elasticsearch.packaging.test.DockerTests - method: test121CanUseStackLoggingConfig - issue: https://github.com/elastic/elasticsearch/issues/128165 -- class: org.elasticsearch.packaging.test.DockerTests - method: test080ConfigurePasswordThroughEnvironmentVariableFile - issue: https://github.com/elastic/elasticsearch/issues/128075 - class: org.elasticsearch.ingest.geoip.GeoIpDownloaderCliIT method: testInvalidTimestamp issue: https://github.com/elastic/elasticsearch/issues/128284 -- class: org.elasticsearch.packaging.test.DockerTests - method: test120DockerLogsIncludeElasticsearchLogs - issue: https://github.com/elastic/elasticsearch/issues/128117 - class: org.elasticsearch.packaging.test.TemporaryDirectoryConfigTests method: test21AcceptsCustomPathInDocker issue: https://github.com/elastic/elasticsearch/issues/128114 @@ -417,30 +339,12 @@ tests: - class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT method: testFailToStartRequestOnRemoteCluster issue: https://github.com/elastic/elasticsearch/issues/128545 -- class: org.elasticsearch.packaging.test.DockerTests - method: test124CanRestartContainerWithStackLoggingConfig - issue: https://github.com/elastic/elasticsearch/issues/128121 -- class: org.elasticsearch.packaging.test.DockerTests - method: test085EnvironmentVariablesAreRespectedUnderDockerExec - issue: https://github.com/elastic/elasticsearch/issues/128115 - class: org.elasticsearch.compute.operator.LimitOperatorTests method: testEarlyTermination issue: https://github.com/elastic/elasticsearch/issues/128721 -- class: org.elasticsearch.packaging.test.DockerTests - method: test040JavaUsesTheOsProvidedKeystore - issue: https://github.com/elastic/elasticsearch/issues/128230 -- class: org.elasticsearch.packaging.test.DockerTests - method: test150MachineDependentHeap - issue: https://github.com/elastic/elasticsearch/issues/128120 - class: org.elasticsearch.xpack.inference.InferenceGetServicesIT method: testGetServicesWithCompletionTaskType issue: https://github.com/elastic/elasticsearch/issues/128952 -- class: org.elasticsearch.packaging.test.DockerTests - method: test073RunEsAsDifferentUserAndGroupWithoutBindMounting - issue: https://github.com/elastic/elasticsearch/issues/128996 -- class: org.elasticsearch.packaging.test.DockerTests - method: test081SymlinksAreFollowedWithEnvironmentVariableFiles - issue: https://github.com/elastic/elasticsearch/issues/128867 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT method: test {lookup-join.EnrichLookupStatsBug ASYNC} issue: https://github.com/elastic/elasticsearch/issues/129228 diff --git a/qa/packaging/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java b/qa/packaging/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java index a157cc84e624e..2db2ebb618d02 100644 --- a/qa/packaging/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java +++ b/qa/packaging/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java @@ -145,6 +145,10 @@ public abstract class PackagingTestCase extends Assert { @Override protected void failed(Throwable e, Description description) { failed = true; + if (installation != null && installation.distribution.isDocker()) { + logger.warn("Test {} failed. Printing logs for failed test...", description.getMethodName()); + dumpDebug(); + } } }; diff --git a/qa/packaging/src/test/java/org/elasticsearch/packaging/util/ServerUtils.java b/qa/packaging/src/test/java/org/elasticsearch/packaging/util/ServerUtils.java index ea71308b11940..f915388011ed9 100644 --- a/qa/packaging/src/test/java/org/elasticsearch/packaging/util/ServerUtils.java +++ b/qa/packaging/src/test/java/org/elasticsearch/packaging/util/ServerUtils.java @@ -150,7 +150,19 @@ private static HttpResponse execute(Request request, String username, String pas executor.auth(username, password); executor.authPreemptive(new HttpHost("localhost", 9200)); } - return executor.execute(request).returnResponse(); + try { + return executor.execute(request).returnResponse(); + } catch (Exception e) { + logger.warn( + "Failed to execute request [{}] with username/password [{}/{}] and caCert [{}]", + request.toString(), + username, + password, + caCert, + e + ); + throw e; + } } // polls every two seconds for Elasticsearch to be running on 9200 @@ -238,14 +250,13 @@ public static void waitForElasticsearch( long timeElapsed = 0; boolean started = false; Throwable thrownException = null; - if (caCert == null) { - caCert = getCaCert(installation); - } while (started == false && timeElapsed < waitTime) { if (System.currentTimeMillis() - lastRequest > requestInterval) { + if (caCert == null) { + caCert = getCaCert(installation); + } try { - final HttpResponse response = execute( Request.Get((caCert != null ? "https" : "http") + "://localhost:9200/_cluster/health") .connectTimeout((int) timeoutLength) @@ -276,7 +287,7 @@ public static void waitForElasticsearch( } started = true; - } catch (IOException e) { + } catch (Exception e) { if (thrownException == null) { thrownException = e; } else { diff --git a/qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java b/qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java index ab167d7663be1..a17ae7781db48 100644 --- a/qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java +++ b/qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java @@ -73,7 +73,7 @@ public class Docker { public static final Shell sh = new Shell(); public static final DockerShell dockerShell = new DockerShell(); public static final int STARTUP_SLEEP_INTERVAL_MILLISECONDS = 1000; - public static final int STARTUP_ATTEMPTS_MAX = 30; + public static final int STARTUP_ATTEMPTS_MAX = 45; /** * The length of the command exceeds what we can use for COLUMNS so we use