Skip to content

Remove elasticsearch.rest-test gradle plugin#85491

Merged
breskeby merged 4 commits intoelastic:masterfrom
breskeby:replace-rest-test-with-iyt
May 17, 2022
Merged

Remove elasticsearch.rest-test gradle plugin#85491
breskeby merged 4 commits intoelastic:masterfrom
breskeby:replace-rest-test-with-iyt

Conversation

@breskeby
Copy link
Copy Markdown
Contributor

@breskeby breskeby commented Mar 30, 2022

Removes and remaining usages of elasticsearch.rest-test and the plugin itself from the codebase

Relates to #63696

@breskeby breskeby self-assigned this Mar 30, 2022
@breskeby breskeby added :Delivery/Build Build or test infrastructure >enhancement Team:Delivery Meta label for Delivery team v7.17.3 v8.1.2 v8.2.0 labels Mar 30, 2022
@breskeby breskeby changed the title Replace elasticsearch.java-rest with elasticsearch.internal-yaml-test where possible Replace elasticsearch.java-rest with elasticsearch.internal-yaml-test Apr 19, 2022
@breskeby breskeby changed the title Replace elasticsearch.java-rest with elasticsearch.internal-yaml-test Deprecate elasticsearch.java-rest Apr 19, 2022
@breskeby breskeby force-pushed the replace-rest-test-with-iyt branch from d477de3 to 47982e7 Compare April 19, 2022 09:26
@breskeby breskeby changed the title Deprecate elasticsearch.java-rest Deprecate elasticsearch.rest-test plugin Apr 19, 2022
@breskeby breskeby changed the title Deprecate elasticsearch.rest-test plugin Deprecate elasticsearch.rest-test gradle plugin Apr 19, 2022
@breskeby breskeby force-pushed the replace-rest-test-with-iyt branch 3 times, most recently from 96b76a0 to 3e498ec Compare April 25, 2022 12:55
@breskeby breskeby force-pushed the replace-rest-test-with-iyt branch 3 times, most recently from 49556e8 to 804f91f Compare May 3, 2022 11:30
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 3, 2022
As we are moving away from StandaloneRestTestPlugin (see elastic#85491) we want to reduce the surface of that plugin.
If rest tests are used a rest test related plugin should be applied
@breskeby breskeby force-pushed the replace-rest-test-with-iyt branch 6 times, most recently from 5bbefc6 to fb8e937 Compare May 9, 2022 10:33
breskeby added a commit that referenced this pull request May 9, 2022
As we are moving away from StandaloneRestTestPlugin (see #85491) we want to reduce the surface of that plugin.
If rest tests are used a rest test related plugin should be applied
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 11, 2022
…st plugin

- Use internal java rest test or internal yaml rest test plugin instead

This is part of elastic#85491
breskeby added a commit that referenced this pull request May 11, 2022
…st plugin (#86626)

- Use internal java rest test or internal yaml rest test plugin instead

This is part of #85491
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 11, 2022
…st plugin (elastic#86626)

- Use internal java rest test or internal yaml rest test plugin instead

This is part of elastic#85491
# Conflicts:
#	qa/snapshot-based-recoveries/azure/src/test/java/org/elasticsearch/recovery/AzureSnapshotBasedRecoveryIT.java
#	qa/snapshot-based-recoveries/gcs/src/test/java/org/elasticsearch/recovery/GCSSnapshotBasedRecoveryIT.java
#	qa/snapshot-based-recoveries/s3/src/test/java/org/elasticsearch/recovery/S3SnapshotBasedRecoveryIT.java
#	x-pack/plugin/repositories-metering-api/qa/azure/build.gradle
#	x-pack/plugin/repositories-metering-api/qa/gcs/build.gradle
#	x-pack/plugin/repositories-metering-api/qa/s3/build.gradle
#	x-pack/plugin/searchable-snapshots/qa/azure/build.gradle
#	x-pack/plugin/searchable-snapshots/qa/gcs/build.gradle
#	x-pack/plugin/searchable-snapshots/qa/minio/build.gradle
#	x-pack/plugin/searchable-snapshots/qa/s3/build.gradle
#	x-pack/plugin/snapshot-based-recoveries/qa/azure/build.gradle
#	x-pack/plugin/snapshot-based-recoveries/qa/azure/src/javaRestTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/AzureSnapshotBasedRecoveryIT.java
#	x-pack/plugin/snapshot-based-recoveries/qa/azure/src/test/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/AzureSnapshotBasedRecoveryIT.java
#	x-pack/plugin/snapshot-based-recoveries/qa/fs/build.gradle
#	x-pack/plugin/snapshot-based-recoveries/qa/fs/src/javaRestTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/FsSnapshotBasedRecoveryIT.java
#	x-pack/plugin/snapshot-based-recoveries/qa/gcs/build.gradle
#	x-pack/plugin/snapshot-based-recoveries/qa/gcs/src/javaRestTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/GCSSnapshotBasedRecoveryIT.java
#	x-pack/plugin/snapshot-based-recoveries/qa/gcs/src/test/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/GCSSnapshotBasedRecoveryIT.java
#	x-pack/plugin/snapshot-based-recoveries/qa/license-enforcing/build.gradle
#	x-pack/plugin/snapshot-based-recoveries/qa/license-enforcing/src/javaRestTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/LicenseIsEnforcedDuringSnapshotBasedRecoveryIT.java
#	x-pack/plugin/snapshot-based-recoveries/qa/s3/build.gradle
#	x-pack/plugin/snapshot-based-recoveries/qa/s3/src/javaRestTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/S3SnapshotBasedRecoveryIT.java
#	x-pack/plugin/snapshot-based-recoveries/qa/s3/src/test/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/S3SnapshotBasedRecoveryIT.java
#	x-pack/plugin/snapshot-repo-test-kit/qa/azure/build.gradle
#	x-pack/plugin/snapshot-repo-test-kit/qa/gcs/build.gradle
#	x-pack/plugin/snapshot-repo-test-kit/qa/minio/build.gradle
#	x-pack/plugin/snapshot-repo-test-kit/qa/s3/build.gradle
#	x-pack/plugin/sql/qa/jdbc/build.gradle
#	x-pack/plugin/sql/qa/jdbc/single-node/src/javaRestTest/java/org/elasticsearch/xpack/sql/qa/jdbc/single_node/JdbcCloseCursorIT.java
#	x-pack/plugin/sql/qa/jdbc/single-node/src/javaRestTest/java/org/elasticsearch/xpack/sql/qa/jdbc/single_node/JdbcWarningsIT.java
#	x-pack/plugin/sql/qa/server/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/sql/qa/multi_node/CliLenientIT.java
#	x-pack/plugin/sql/qa/server/security/build.gradle
#	x-pack/plugin/sql/qa/server/single-node/build.gradle
#	x-pack/plugin/sql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/sql/qa/single_node/CliLenientIT.java
#	x-pack/plugin/sql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/sql/qa/single_node/RestSqlDeprecationIT.java
#	x-pack/plugin/sql/qa/server/single-node/src/javaRestTest/java/org/elasticsearch/xpack/sql/qa/single_node/RestSqlPaginationIT.java
#	x-pack/plugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlTestCase.java
#	x-pack/plugin/sql/qa/server/src/main/resources/command.csv-spec
#	x-pack/plugin/sql/qa/server/src/main/resources/single-node-only/command-sys.csv-spec
#	x-pack/plugin/sql/qa/server/src/main/resources/slow/frozen.csv-spec
#	x-pack/plugin/vector-tile/qa/multi-cluster/build.gradle
@breskeby breskeby force-pushed the replace-rest-test-with-iyt branch 2 times, most recently from 8f03698 to cfc4226 Compare May 11, 2022 19:04
@breskeby breskeby force-pushed the replace-rest-test-with-iyt branch 2 times, most recently from d90c605 to 7c6b4fa Compare May 12, 2022 10:32
@breskeby breskeby changed the title Deprecate elasticsearch.rest-test gradle plugin Remove elasticsearch.rest-test gradle plugin May 12, 2022
@breskeby breskeby force-pushed the replace-rest-test-with-iyt branch from 7c6b4fa to 6ea9525 Compare May 12, 2022 16:08
@breskeby breskeby marked this pull request as ready for review May 12, 2022 17:23
@elasticmachine
Copy link
Copy Markdown
Collaborator

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

@breskeby breskeby force-pushed the replace-rest-test-with-iyt branch from 6ea9525 to fd3fd84 Compare May 12, 2022 17:30
@breskeby breskeby removed the v8.1.2 label May 12, 2022
@breskeby breskeby force-pushed the replace-rest-test-with-iyt branch from 018af00 to 6d052f2 Compare May 16, 2022 05:44
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;

public class UpdateDatabasesIT extends ESRestTestCase {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is this file deleted?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same with the database file itself. Perhaps we inteded to move these?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

they have been moved in an earlier pr 🤦 so this is basically a cleanup

Copy link
Copy Markdown
Contributor

@mark-vieira mark-vieira left a comment

Choose a reason for hiding this comment

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

I think that geoip test got mistakenly removed, otherwise LGTM.

import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;

public class UpdateDatabasesIT extends ESRestTestCase {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same with the database file itself. Perhaps we inteded to move these?

@breskeby
Copy link
Copy Markdown
Contributor Author

I accidentally have moved the files in an earlier commit but didn't delete the old location. I'll fix this up

@breskeby breskeby merged commit bf4304d into elastic:master May 17, 2022
@breskeby breskeby deleted the replace-rest-test-with-iyt branch May 17, 2022 09:23
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 23, 2022
Removes and remaining usages of `elasticsearch.rest-test` and the plugin itself from the codebase

Relates to elastic#63696
# Conflicts:
#	build-tools-internal/build.gradle
#	modules/ingest-geoip/qa/file-based-update/src/test/java/org/elasticsearch/ingest/geoip/UpdateDatabasesIT.java
breskeby added a commit that referenced this pull request May 23, 2022
Backports the following commits to 7.17:
 - Remove elasticsearch.rest-test gradle plugin (#85491)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Delivery/Build Build or test infrastructure >enhancement Team:Delivery Meta label for Delivery team v7.17.3 v8.3.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants