Skip to content

Commit 4737545

Browse files
committed
Fix failing docker packaging tests due to too long commandline (elastic#125053)
* Increate COLUMN for detecting running elasticsearch instance * Unmute DockerTest test (cherry picked from commit 38f2439) # Conflicts: # muted-tests.yml
1 parent 54a8c25 commit 4737545

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

muted-tests.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,6 @@ tests:
396396
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
397397
method: test {p0=snapshot/20_operator_privileges_disabled/Operator only settings can be set and restored by non-operator user when operator privileges is disabled}
398398
issue: https://github.com/elastic/elasticsearch/issues/120973
399-
- class: org.elasticsearch.packaging.test.DockerTests
400-
issue: https://github.com/elastic/elasticsearch/issues/120978
401399
- class: org.elasticsearch.xpack.security.authc.service.ServiceAccountIT
402400
method: testAuthenticateShouldNotFallThroughInCaseOfFailure
403401
issue: https://github.com/elastic/elasticsearch/issues/120902
@@ -475,4 +473,4 @@ tests:
475473
issue: https://github.com/elastic/elasticsearch/issues/120148
476474
- class: org.elasticsearch.index.mapper.ShapeGeometryFieldMapperTests
477475
method: testCartesianBoundsBlockLoader
478-
issue: https://github.com/elastic/elasticsearch/issues/125129
476+
issue: https://github.com/elastic/elasticsearch/issues/125129

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)