github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix failing docker packaging tests due to too long commandline (#125053) (#125286)

Browse source 
* Increate COLUMN for detecting running elasticsearch instance
* Unmute DockerTest test

(cherry picked from commit 38f243944e)

# Conflicts:
#	muted-tests.yml
#	qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java
This commit is contained in:
Rene Groeschke 2025-03-21 09:50:02 +01:00 • committed by GitHub
parent c63c7f5f8c
commit f5a43068ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
muted-tests.yml
View file

@ -398,4 +398,4 @@ tests:
# issue: "https://github.com/elastic/elasticsearch/..." # issue: "https://github.com/elastic/elasticsearch/..."
# - class: "org.elasticsearch.xpack.esql.**" # - class: "org.elasticsearch.xpack.esql.**"
# method: "test {union_types.MultiIndexIpStringStatsInline *}" # method: "test {union_types.MultiIndexIpStringStatsInline *}"
# issue: "https://github.com/elastic/elasticsearch/..." # issue: "https://github.com/elastic/elasticsearch/..."

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

@ -187,7 +187,7 @@ public class Docker {
Thread.sleep(STARTUP_SLEEP_INTERVAL_MILLISECONDS); Thread.sleep(STARTUP_SLEEP_INTERVAL_MILLISECONDS);
// Set COLUMNS so that `ps` doesn't truncate its output // Set COLUMNS so that `ps` doesn't truncate its output
psOutput = dockerShell.run("bash -c 'COLUMNS=2000 ps ax'").stdout(); psOutput = dockerShell.run("bash -c 'COLUMNS=4000 ps ax'").stdout();
if (psOutput.contains("org.elasticsearch.bootstrap.Elasticsearch")) { if (psOutput.contains("org.elasticsearch.bootstrap.Elasticsearch")) {
isElasticsearchRunning = true; isElasticsearchRunning = true;