Skip to content

Conversation

breskeby
Copy link
Contributor

Some aftermath of issue introduced with #115122

@breskeby breskeby added >non-issue :Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team :Security/FIPS Running ES in FIPS 140-2 mode labels Nov 18, 2024
@breskeby breskeby self-assigned this Nov 18, 2024
@breskeby breskeby requested a review from a team as a code owner November 18, 2024 12:52
@elasticsearchmachine elasticsearchmachine added Team:Security Meta label for security team v9.0.0 labels Nov 18, 2024
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-security (Team:Security)

@elasticsearchmachine
Copy link
Collaborator

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

@breskeby breskeby enabled auto-merge (squash) November 18, 2024 13:25
@breskeby breskeby added auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) auto-backport Automatically create backport pull requests when merged v8.17.0 labels Nov 18, 2024
@breskeby breskeby merged commit 81e3afa into elastic:main Nov 18, 2024
17 checks passed
@breskeby breskeby deleted the fix-fips-testing-after-buildparams-change branch November 18, 2024 13:56
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
8.x Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 116934

breskeby added a commit to breskeby/elasticsearch that referenced this pull request Nov 24, 2024
breskeby added a commit to breskeby/elasticsearch that referenced this pull request Nov 26, 2024
breskeby added a commit to breskeby/elasticsearch that referenced this pull request Nov 26, 2024
@breskeby
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
8.x
8.17

Questions ?

Please refer to the Backport tool documentation

breskeby added a commit that referenced this pull request Nov 26, 2024
breskeby added a commit that referenced this pull request Nov 26, 2024
breskeby added a commit that referenced this pull request Nov 27, 2024
* [Gradle] Remove static use of BuildParams (#115122)

Static fields dont do well in Gradle with configuration cache enabled.

- Use buildParams extension in build scripts
- Keep BuildParams.ci for now for easy serverless migration
-  Tweak testing doc

(cherry picked from commit 13c8aae)

# Conflicts:
#	TESTING.asciidoc
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/AbstractYamlRestCompatTestPlugin.java
#	build.gradle
#	modules/ingest-geoip/qa/full-cluster-restart/build.gradle
#	qa/mixed-cluster/build.gradle
#	x-pack/plugin/ent-search/qa/full-cluster-restart/build.gradle
#	x-pack/plugin/eql/qa/rest/build.gradle
#	x-pack/plugin/fleet/qa/rest/build.gradle
#	x-pack/plugin/kql/build.gradle
#	x-pack/plugin/mapper-unsigned-long/build.gradle
#	x-pack/plugin/ml/qa/multi-cluster-tests-with-security/build.gradle
#	x-pack/plugin/security/qa/multi-cluster/build.gradle
#	x-pack/plugin/sql/qa/jdbc/build.gradle
#	x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle

* Fix merge

* [Build] Fix fips testing after buildparams rework (#116934)

* More Cleanup

* [Build] Fix checkstyle exclusions on windows (#115185)

* More merge fixes

* Delete x-pack/plugin/kql/build.gradle
alexey-ivanov-es pushed a commit to alexey-ivanov-es/elasticsearch that referenced this pull request Nov 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Automatically create backport pull requests when merged auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport pending :Delivery/Build Build or test infrastructure >non-issue :Security/FIPS Running ES in FIPS 140-2 mode Team:Delivery Meta label for Delivery team Team:Security Meta label for security team v8.17.0 v9.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants