Skip to content

Conversation

@mark-vieira
Copy link
Contributor

@mark-vieira mark-vieira commented Mar 28, 2025

This was a fun one 😄

I collapsed most of the CCR "qa" projects into the main module. I only kept the XpackUsageIT in it's only qa project because it relies on the default distribution. This way we isolate the other tests that can use the integ-test distribution.

@mark-vieira mark-vieira added >test Issues or PRs that are addressing/adding tests :Delivery/Build Build or test infrastructure >refactoring :Security/FIPS Running ES in FIPS 140-2 mode test-windows Trigger CI checks on Windows auto-backport Automatically create backport pull requests when merged test-release Trigger CI checks against release build v8.18.1 v8.19.0 v9.0.1 labels Mar 28, 2025
@elasticsearchmachine elasticsearchmachine added Team:Security Meta label for security team Team:Delivery Meta label for Delivery team v9.1.0 labels Mar 28, 2025
@elasticsearchmachine
Copy link
Collaborator

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

@elasticsearchmachine
Copy link
Collaborator

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

dependencies {
compileOnly project(":server")

tasks.register('internalClusterTestNoSecurityManager', Test) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Security manager isn't a thing anymore so we don't need this extra task.

@mark-vieira mark-vieira requested a review from a team as a code owner March 28, 2025 22:16
@mark-vieira mark-vieira removed :Security/FIPS Running ES in FIPS 140-2 mode Team:Security Meta label for security team labels Mar 31, 2025
@mark-vieira mark-vieira removed test-release Trigger CI checks against release build test-windows Trigger CI checks on Windows labels Mar 31, 2025
@mark-vieira mark-vieira merged commit 66ba3c2 into elastic:main Mar 31, 2025
17 checks passed
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

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

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

@mark-vieira
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
8.18

Questions ?

Please refer to the Backport tool documentation

mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Mar 31, 2025
(cherry picked from commit 66ba3c2)

# Conflicts:
#	x-pack/plugin/ccr/qa/build.gradle
#	x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle
#	x-pack/plugin/ccr/qa/multi-cluster/build.gradle
#	x-pack/plugin/ccr/src/javaRestTest/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java
@mark-vieira
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
8.x

Questions ?

Please refer to the Backport tool documentation

mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Mar 31, 2025
(cherry picked from commit 66ba3c2)

# Conflicts:
#	x-pack/plugin/ccr/qa/build.gradle
#	x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle
#	x-pack/plugin/ccr/qa/multi-cluster/build.gradle
#	x-pack/plugin/ccr/src/javaRestTest/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java
elasticsearchmachine pushed a commit that referenced this pull request Mar 31, 2025
(cherry picked from commit 66ba3c2)

# Conflicts:
#	x-pack/plugin/ccr/qa/build.gradle
#	x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle
#	x-pack/plugin/ccr/qa/multi-cluster/build.gradle
#	x-pack/plugin/ccr/src/javaRestTest/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java
elasticsearchmachine pushed a commit that referenced this pull request Mar 31, 2025
(cherry picked from commit 66ba3c2)

# Conflicts:
#	x-pack/plugin/ccr/qa/build.gradle
#	x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle
#	x-pack/plugin/ccr/qa/multi-cluster/build.gradle
#	x-pack/plugin/ccr/src/javaRestTest/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java
afoucret pushed a commit to afoucret/elasticsearch that referenced this pull request Apr 1, 2025
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 :Delivery/Build Build or test infrastructure >refactoring Team:Delivery Meta label for Delivery team >test Issues or PRs that are addressing/adding tests v8.18.1 v8.19.0 v9.0.1 v9.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants