From d0da1eadc61c507f8f84f6c333906a00af28170a 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 (cherry picked from commit 38f243944e5d2aa5d66308eb6a959d7bb2a25dce) # Conflicts: # muted-tests.yml --- muted-tests.yml | 2 +- .../java/org/elasticsearch/packaging/util/docker/Docker.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 6655de2b5d89f..3d95e42cb08b2 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -299,4 +299,4 @@ tests: # issue: "https://github.com/elastic/elasticsearch/..." # - class: "org.elasticsearch.xpack.esql.**" # method: "test {union_types.MultiIndexIpStringStatsInline *}" -# issue: "https://github.com/elastic/elasticsearch/..." +# issue: "https://github.com/elastic/elasticsearch/..." \ No newline at end of file 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 7bb45e6029409..6ec99d18042ca 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 static void waitForElasticsearchToStart() { 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;