Fix SamlAuthenticationIT flakyness #103867

breskeby · 2024-01-03T14:36:47Z

No description provided.

breskeby · 2024-01-23T14:31:20Z

...d-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerBuildTask.java

@@ -181,7 +185,7 @@ public void execute() {
            }

            final List<String> tags = parameters.getTags().get();
-            final boolean isCrossPlatform = parameters.getPlatform().get().equals(Architecture.current().dockerPlatform) == false;
+            final boolean isCrossPlatform = isCrossPlatform();


Tweaked this to allow reusing this task and supporting multi platform images

Ah, neat. I didn't know you could pass multiple platforms at once.

breskeby · 2024-01-23T14:32:31Z

...d-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerBuildTask.java

@@ -203,18 +207,34 @@ public void execute() {
                tags.forEach(tag -> spec.args("--tag", tag));

                parameters.getBuildArgs().get().forEach((k, v) -> spec.args("--build-arg", k + "=" + v));
+
+                if (parameters.getPush().getOrElse(false)) {


Allow pushing directly from here. Makes it easier to push multiple images within a gradle build without the need of doing as part of a script after the build as we use to do for distribution images

breskeby · 2024-01-24T08:50:56Z

This looks stable now: https://buildkite.com/elastic/elasticsearch-pull-request/builds/8265

breskeby · 2024-01-24T09:02:12Z

.buildkite/scripts/fixture-deploy.sh

+unset DOCKER_REGISTRY_USERNAME DOCKER_REGISTRY_PASSWORD
+
+docker buildx create --use
+.ci/scripts/run-gradle.sh deployFixtureDockerImages


prep for setting up a ci pipeline for building and deploying docker based fixtures once per day https://github.com/elastic/elasticsearch-infra/pull/378

breskeby · 2024-01-24T09:06:42Z

x-pack/test/idp-fixture/src/main/resources/idp/shibboleth-idp/conf/admin/metrics.xml

@@ -9,42 +9,14 @@

    default-init-method="initialize"
    default-destroy-method="destroy">
-


While debugging I noticed some unused metrics are setup. removed more output noise than startup time though

breskeby · 2024-01-24T09:17:39Z

x-pack/test/idp-fixture/build.gradle

+
+tasks.register("deployFixtureDockerImages") {
+  dependsOn tasks.withType(DockerBuildTask)
+}


We can move parts of this to an internal plugin once we do this fixture pre baking for more fixtures. We can evaluate existing fixtures in a later pr

Sounds good.

mark-vieira · 2024-01-24T16:35:13Z

...d-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerBuildTask.java

@@ -181,7 +185,7 @@ public void execute() {
            }

            final List<String> tags = parameters.getTags().get();
-            final boolean isCrossPlatform = parameters.getPlatform().get().equals(Architecture.current().dockerPlatform) == false;
+            final boolean isCrossPlatform = isCrossPlatform();


Seems unnecessary to have this field now that this logic lives in the isCrosPlatform() method.

mark-vieira · 2024-01-24T16:36:02Z

...d-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerBuildTask.java


    @Inject
    public DockerBuildTask(WorkerExecutor workerExecutor, ObjectFactory objectFactory, ProjectLayout projectLayout) {
        this.workerExecutor = workerExecutor;
        this.markerFile = objectFactory.fileProperty();
        this.dockerContext = objectFactory.directoryProperty();
        this.buildArgs = objectFactory.mapProperty(String.class, String.class);
-        this.platform = objectFactory.property(String.class).convention(Architecture.current().dockerPlatform);


FYI, this change is going to have implications for the serverless build, we'll want to follow up with a fix there once this is merged.

mark-vieira · 2024-01-24T16:38:23Z

x-pack/test/idp-fixture/build.gradle

+
+tasks.register("deployFixtureDockerImages") {
+  dependsOn tasks.withType(DockerBuildTask)
+}


Sounds good.

mark-vieira · 2024-01-24T16:38:48Z

x-pack/test/idp-fixture/build.gradle

+    baseImages = ["openjdk:11.0.16-jre"]
+    noCache = BuildParams.isCi
+    tags = ["docker.elastic.co/elasticsearch-dev/idp-fixture:1.0"]
+    getPush().set(BuildParams.isCi)


should be able to simplify this as push = BuildParams.isCI

mark-vieira · 2024-01-24T16:44:11Z

x-pack/test/idp-fixture/src/main/java/org/elasticsearch/test/fixtures/idp/IdpTestContainer.java

-                    // .expose(4443)
-                    .build()
-            )
+            new ImageFromDockerfile("es-idp-testfixture").withDockerfileFromBuilder(builder -> builder.from(DOCKER_BASE_IMAGE).build())


I think we want to use RemoteDockerImage here instead. That should avoid building essentially an "empty" Dockerfile that just extends from the remote one.

mark-vieira · 2024-01-24T16:44:46Z

...est/idp-fixture/src/main/java/org/elasticsearch/test/fixtures/idp/OpenLdapTestContainer.java

-
-                    .build()
-            )
+            new ImageFromDockerfile("es-openldap-testfixture").withDockerfileFromBuilder(builder -> builder.from(DOCKER_BASE_IMAGE).build())


Same as before, we should use RemoteDockerImage.

elasticsearchmachine · 2024-01-24T17:50:52Z

Pinging @elastic/es-delivery (Team:Delivery)

breskeby added >non-issue :Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team v8.13.0 labels Jan 3, 2024

breskeby self-assigned this Jan 3, 2024

breskeby force-pushed the debug-saml-tests branch from 2cdc28e to 97b9210 Compare January 8, 2024 10:59

breskeby added the WIP label Jan 9, 2024

breskeby force-pushed the debug-saml-tests branch 4 times, most recently from 35ec975 to 07f55c3 Compare January 17, 2024 11:01

breskeby force-pushed the debug-saml-tests branch 5 times, most recently from bd1c264 to a9a8809 Compare January 23, 2024 09:02

breskeby commented Jan 23, 2024

View reviewed changes

breskeby force-pushed the debug-saml-tests branch from 718c987 to 15f4b83 Compare January 24, 2024 08:58

breskeby commented Jan 24, 2024

View reviewed changes

breskeby marked this pull request as ready for review January 24, 2024 09:18

breskeby requested a review from a team as a code owner January 24, 2024 09:18

breskeby changed the title ~~Debug SamlAuthenticationIT flakyness~~ Fix SamlAuthenticationIT flakyness Jan 24, 2024

mark-vieira approved these changes Jan 24, 2024

View reviewed changes

breskeby added 3 commits January 24, 2024 18:22

Debug SamlAuthenticationIT flakyness

2ac2809

Enable test and add better logging of testcontainer output

19ee95d

run whole checkPart2 for debugging SamlAuth tests

cb66224

breskeby added 23 commits January 24, 2024 18:22

Test cross platform idp fixture image

cf5ce8a

WIP

b5a0edc

WIP

12709f8

Fix docker task tweaks for distribution building

20103fd

Handle default for push property in DockerBuildTask

c6c3e18

Mark push property as optional

cf4a5a3

fix spotless

2f31d62

Add deploy test fixture docker images to periodic builds

2595d6a

Fix idp fixture url for idp container

771d6e2

use docker credentials in buildkite deploy step

b37904d

fix typos in pipeline definition

c96f1cc

Update periodic pipeline

413708f

Try install docker driver as part of the build

19ef7fb

Fix buildx setup

be44114

tweak fixture deployment logic

44bbf1a

Fix script paths

90b2d7d

Cleanup periodic pipeline

b325c9d

Revert periodic pipeline change

389ec29

Cleanup idp related rework

1be7468

Fix openldap fixture docker file

5c1a323

Reset bk tweaks; cleanup

9a04969

More cleanup

d99f925

More cleanup after review

c6413b7

breskeby force-pushed the debug-saml-tests branch from 3511ae1 to c6413b7 Compare January 24, 2024 17:49

breskeby added auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) and removed WIP labels Jan 24, 2024

elasticsearchmachine merged commit ab8ee60 into elastic:main Jan 24, 2024
15 checks passed

breskeby deleted the debug-saml-tests branch January 24, 2024 18:44

henningandersen pushed a commit to henningandersen/elasticsearch that referenced this pull request Jan 25, 2024

Fix SamlAuthenticationIT flakyness (elastic#103867)

c86472e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix SamlAuthenticationIT flakyness #103867

Fix SamlAuthenticationIT flakyness #103867

breskeby commented Jan 3, 2024

breskeby Jan 23, 2024 •

edited

Loading

mark-vieira Jan 24, 2024 •

edited

Loading

breskeby Jan 23, 2024 •

edited

Loading

breskeby commented Jan 24, 2024

breskeby Jan 24, 2024

breskeby Jan 24, 2024

breskeby Jan 24, 2024

mark-vieira Jan 24, 2024

mark-vieira Jan 24, 2024

mark-vieira Jan 24, 2024

mark-vieira Jan 24, 2024

mark-vieira Jan 24, 2024

mark-vieira Jan 24, 2024

mark-vieira Jan 24, 2024

elasticsearchmachine commented Jan 24, 2024

		@@ -9,42 +9,14 @@

		default-init-method="initialize"
		default-destroy-method="destroy">

Fix SamlAuthenticationIT flakyness #103867

Fix SamlAuthenticationIT flakyness #103867

Conversation

breskeby commented Jan 3, 2024

breskeby Jan 23, 2024 • edited Loading

Choose a reason for hiding this comment

mark-vieira Jan 24, 2024 • edited Loading

Choose a reason for hiding this comment

breskeby Jan 23, 2024 • edited Loading

Choose a reason for hiding this comment

breskeby commented Jan 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elasticsearchmachine commented Jan 24, 2024

breskeby Jan 23, 2024 •

edited

Loading

mark-vieira Jan 24, 2024 •

edited

Loading

breskeby Jan 23, 2024 •

edited

Loading