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)

Browse source 
* Increate COLUMN for detecting running elasticsearch instance
* Unmute DockerTest test
This commit is contained in:
Rene Groeschke 2025-03-20 08:27:40 +01:00 • committed by GitHub
parent c8de8d1fd4
commit 38f243944e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
muted-tests.yml
View file

@ -390,9 +390,6 @@ tests:
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT - class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=search/610_function_score/Random} method: test {p0=search/610_function_score/Random}
issue: https://github.com/elastic/elasticsearch/issues/125010 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 - class: org.elasticsearch.xpack.ilm.DataStreamAndIndexLifecycleMixingTests
method: testGetDataStreamResponse method: testGetDataStreamResponse
issue: https://github.com/elastic/elasticsearch/issues/125083 issue: https://github.com/elastic/elasticsearch/issues/125083

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=3000 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;