Skip to content

Commit 4c098aa

Browse files
authored
Fix failing docker packaging tests due to too long commandline (#125053) (#125284)
* Increate COLUMN for detecting running elasticsearch instance * Unmute DockerTest test (cherry picked from commit 38f2439) # Conflicts: # muted-tests.yml
1 parent 4520b6b commit 4c098aa

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

muted-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,4 +299,4 @@ tests:
299299
# issue: "https://github.com/elastic/elasticsearch/..."
300300
# - class: "org.elasticsearch.xpack.esql.**"
301301
# method: "test {union_types.MultiIndexIpStringStatsInline *}"
302-
# issue: "https://github.com/elastic/elasticsearch/..."
302+
# issue: "https://github.com/elastic/elasticsearch/..."

qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public static void waitForElasticsearchToStart() {
187187
Thread.sleep(STARTUP_SLEEP_INTERVAL_MILLISECONDS);
188188

189189
// Set COLUMNS so that `ps` doesn't truncate its output
190-
psOutput = dockerShell.run("bash -c 'COLUMNS=3000 ps ax'").stdout();
190+
psOutput = dockerShell.run("bash -c 'COLUMNS=4000 ps ax'").stdout();
191191

192192
if (psOutput.contains("org.elasticsearch.bootstrap.Elasticsearch")) {
193193
isElasticsearchRunning = true;

0 commit comments

Comments
 (0)