From 2c870a4cce6e556c074ab064c2966b8cd3a0b3ea Mon Sep 17 00:00:00 2001 From: ankitsethi Date: Wed, 11 Jun 2025 15:35:05 -0500 Subject: [PATCH 01/10] increase the number of retries for apt-get --- .../org/elasticsearch/test/fixtures/smb/SmbTestContainer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java b/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java index 27d8257f4be10..60401f6f27be8 100644 --- a/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java +++ b/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java @@ -27,6 +27,7 @@ public SmbTestContainer() { new ImageFromDockerfile("es-smb-fixture").withDockerfileFromBuilder( builder -> builder.from(DOCKER_BASE_IMAGE) .env("TZ", "Etc/UTC") + .run("echo 'Acquire::Retries \"10\";' | sudo tee /etc/apt/apt.conf.d/80-retries") .run("DEBIAN_FRONTEND=noninteractive apt-get update -qqy && apt-get install -qqy tzdata winbind samba ldap-utils") .copy("fixture/provision/installsmb.sh", "/fixture/provision/installsmb.sh") .copy("fixture/certs/ca.key", "/fixture/certs/ca.key") From a0e550ae5f25fd344eaef581814ded13d2a23986 Mon Sep 17 00:00:00 2001 From: Ankit Sethi <9.ankitsethi@gmail.com> Date: Wed, 11 Jun 2025 15:41:33 -0500 Subject: [PATCH 02/10] Update docs/changelog/129295.yaml --- docs/changelog/129295.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 docs/changelog/129295.yaml diff --git a/docs/changelog/129295.yaml b/docs/changelog/129295.yaml new file mode 100644 index 0000000000000..686f67990fd07 --- /dev/null +++ b/docs/changelog/129295.yaml @@ -0,0 +1,6 @@ +pr: 129295 +summary: Increase the number of retries for apt-get +area: Security +type: enhancement +issues: + - 124490 From ae98adc2f8fa6107979d0df880cc16e6f51500dd Mon Sep 17 00:00:00 2001 From: ankitsethi Date: Wed, 11 Jun 2025 17:05:07 -0500 Subject: [PATCH 03/10] try without sudo --- .../org/elasticsearch/test/fixtures/smb/SmbTestContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java b/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java index 60401f6f27be8..b2d18821493f8 100644 --- a/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java +++ b/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java @@ -27,7 +27,7 @@ public SmbTestContainer() { new ImageFromDockerfile("es-smb-fixture").withDockerfileFromBuilder( builder -> builder.from(DOCKER_BASE_IMAGE) .env("TZ", "Etc/UTC") - .run("echo 'Acquire::Retries \"10\";' | sudo tee /etc/apt/apt.conf.d/80-retries") + .run("echo 'Acquire::Retries \"10\";' | tee /etc/apt/apt.conf.d/80-retries") .run("DEBIAN_FRONTEND=noninteractive apt-get update -qqy && apt-get install -qqy tzdata winbind samba ldap-utils") .copy("fixture/provision/installsmb.sh", "/fixture/provision/installsmb.sh") .copy("fixture/certs/ca.key", "/fixture/certs/ca.key") From 1bfbf394aedaf84d6b82b890badfa642dac8d8cb Mon Sep 17 00:00:00 2001 From: ankitsethi Date: Wed, 11 Jun 2025 17:09:07 -0500 Subject: [PATCH 04/10] increase timeout to see if that fixes it --- .../xpack/security/SecurityRolesMultiProjectIT.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityRolesMultiProjectIT.java b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityRolesMultiProjectIT.java index 2cf6fe02411ca..a00f0867751a6 100644 --- a/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityRolesMultiProjectIT.java +++ b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityRolesMultiProjectIT.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.util.Collection; import java.util.Map; +import java.util.concurrent.TimeUnit; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -132,7 +133,8 @@ public void testUpdatingFileBasedRoleAffectsAllProjects() throws Exception { assertBusy(() -> { assertThat(getClusterPrivileges(project1, username1), contains("monitor")); assertThat(getClusterPrivileges(project2, username2), contains("monitor")); - }); + }, 20, TimeUnit.SECONDS); // increasing this to try and solve for a rare failure + rolesFile.update(Resource.fromString("")); assertBusy(() -> { From 20e09a7276459bb593a7fc6bb59377c3d03e44b4 Mon Sep 17 00:00:00 2001 From: ankitsethi Date: Thu, 12 Jun 2025 10:20:01 -0500 Subject: [PATCH 05/10] mention a couple of more tests --- docs/changelog/129295.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changelog/129295.yaml b/docs/changelog/129295.yaml index 686f67990fd07..ab188f11db049 100644 --- a/docs/changelog/129295.yaml +++ b/docs/changelog/129295.yaml @@ -4,3 +4,5 @@ area: Security type: enhancement issues: - 124490 + - 127738 + - 126223 From ab8015a2a585c1bfd89ba5a9c4cdf23819ede96a Mon Sep 17 00:00:00 2001 From: ankitsethi Date: Thu, 12 Jun 2025 14:10:56 -0500 Subject: [PATCH 06/10] try inline option --- .../elasticsearch/test/fixtures/smb/SmbTestContainer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java b/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java index b2d18821493f8..35654361c4093 100644 --- a/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java +++ b/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java @@ -27,8 +27,9 @@ public SmbTestContainer() { new ImageFromDockerfile("es-smb-fixture").withDockerfileFromBuilder( builder -> builder.from(DOCKER_BASE_IMAGE) .env("TZ", "Etc/UTC") - .run("echo 'Acquire::Retries \"10\";' | tee /etc/apt/apt.conf.d/80-retries") - .run("DEBIAN_FRONTEND=noninteractive apt-get update -qqy && apt-get install -qqy tzdata winbind samba ldap-utils") + .run( + "DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Retries=10 update -qqy && apt-get install -qqy tzdata winbind samba ldap-utils " + ) .copy("fixture/provision/installsmb.sh", "/fixture/provision/installsmb.sh") .copy("fixture/certs/ca.key", "/fixture/certs/ca.key") .copy("fixture/certs/ca.pem", "/fixture/certs/ca.pem") From 6c2908581f699226778e2b7bea5872b50f3c51be Mon Sep 17 00:00:00 2001 From: ankitsethi Date: Thu, 12 Jun 2025 14:11:24 -0500 Subject: [PATCH 07/10] try inline option --- .../org/elasticsearch/test/fixtures/smb/SmbTestContainer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java b/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java index 35654361c4093..e2d268bf26619 100644 --- a/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java +++ b/x-pack/test/smb-fixture/src/main/java/org/elasticsearch/test/fixtures/smb/SmbTestContainer.java @@ -28,7 +28,8 @@ public SmbTestContainer() { builder -> builder.from(DOCKER_BASE_IMAGE) .env("TZ", "Etc/UTC") .run( - "DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Retries=10 update -qqy && apt-get install -qqy tzdata winbind samba ldap-utils " + "DEBIAN_FRONTEND=noninteractive apt-get -o Acquire::Retries=10 update -qqy && apt-get install -qqy tzdata" + + " winbind samba ldap-utils " ) .copy("fixture/provision/installsmb.sh", "/fixture/provision/installsmb.sh") .copy("fixture/certs/ca.key", "/fixture/certs/ca.key") From 5c5ebd51394095d1380d1fea2949c7113ae1f30e Mon Sep 17 00:00:00 2001 From: Ankit Sethi <9.ankitsethi@gmail.com> Date: Fri, 13 Jun 2025 10:53:19 -0500 Subject: [PATCH 08/10] Delete docs/changelog/129295.yaml --- docs/changelog/129295.yaml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 docs/changelog/129295.yaml diff --git a/docs/changelog/129295.yaml b/docs/changelog/129295.yaml deleted file mode 100644 index ab188f11db049..0000000000000 --- a/docs/changelog/129295.yaml +++ /dev/null @@ -1,8 +0,0 @@ -pr: 129295 -summary: Increase the number of retries for apt-get -area: Security -type: enhancement -issues: - - 124490 - - 127738 - - 126223 From afe253b7abe9cb255076e1e38c53a8baaeccd30c Mon Sep 17 00:00:00 2001 From: ankitsethi Date: Fri, 13 Jun 2025 11:19:48 -0500 Subject: [PATCH 09/10] bump this too --- .../xpack/security/SecurityRolesMultiProjectIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityRolesMultiProjectIT.java b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityRolesMultiProjectIT.java index a00f0867751a6..cd223e57deedd 100644 --- a/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityRolesMultiProjectIT.java +++ b/test/external-modules/multi-project/src/javaRestTest/java/org/elasticsearch/xpack/security/SecurityRolesMultiProjectIT.java @@ -141,7 +141,7 @@ public void testUpdatingFileBasedRoleAffectsAllProjects() throws Exception { // Both projects should automatically reflect that the role has been removed assertThat(getClusterPrivileges(project1, username1), empty()); assertThat(getClusterPrivileges(project2, username2), empty()); - }); + }, 20, TimeUnit.SECONDS); } private void createUser(ProjectId projectId, String username, String roleName) throws IOException { From 5d2f9b23b77c4275b2ccd8bf7f7b7ebc30d2d727 Mon Sep 17 00:00:00 2001 From: ankitsethi Date: Fri, 13 Jun 2025 12:12:18 -0500 Subject: [PATCH 10/10] possibly ok test now --- muted-tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index 21811214d67c5..4151e7d394f21 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -301,9 +301,6 @@ tests: - class: org.elasticsearch.index.engine.ThreadPoolMergeSchedulerTests method: testSchedulerCloseWaitsForRunningMerge issue: https://github.com/elastic/elasticsearch/issues/125236 -- class: org.elasticsearch.xpack.security.SecurityRolesMultiProjectIT - method: testUpdatingFileBasedRoleAffectsAllProjects - issue: https://github.com/elastic/elasticsearch/issues/126223 - class: org.elasticsearch.packaging.test.DockerTests method: test020PluginsListWithNoPlugins issue: https://github.com/elastic/elasticsearch/issues/126232