From 38f243944e5d2aa5d66308eb6a959d7bb2a25dce Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Thu, 20 Mar 2025 08:27:40 +0100 Subject: [PATCH] Fix failing docker packaging tests due to too long commandline (#125053) * Increate COLUMN for detecting running elasticsearch instance * Unmute DockerTest test --- muted-tests.yml | 3 --- .../java/org/elasticsearch/packaging/util/docker/Docker.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 9120f1a77890..e8daf3fdd1d2 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -390,9 +390,6 @@ tests: - class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT method: test {p0=search/610_function_score/Random} issue: https://github.com/elastic/elasticsearch/issues/125010 -- class: org.elasticsearch.packaging.test.DockerTests - method: test010Install - issue: https://github.com/elastic/elasticsearch/issues/119441 - class: org.elasticsearch.xpack.ilm.DataStreamAndIndexLifecycleMixingTests method: testGetDataStreamResponse issue: https://github.com/elastic/elasticsearch/issues/125083 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 7bb45e602940..6ec99d18042c 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 @@ -187,7 +187,7 @@ public class Docker { Thread.sleep(STARTUP_SLEEP_INTERVAL_MILLISECONDS); // Set COLUMNS so that `ps` doesn't truncate its output - psOutput = dockerShell.run("bash -c 'COLUMNS=3000 ps ax'").stdout(); + psOutput = dockerShell.run("bash -c 'COLUMNS=4000 ps ax'").stdout(); if (psOutput.contains("org.elasticsearch.bootstrap.Elasticsearch")) { isElasticsearchRunning = true;