chore: move e2e tests to integration-test module

Aiven-Open · Nov 28, 2024 · 7e9fcc2 · 7e9fcc2
1 parent acccbb0
commit 7e9fcc2
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -31,32 +31,32 @@ checkstyle:
 build: build/distributions/tiered-storage-for-apache-kafka-$(VERSION).tgz storage/s3/build/distributions/s3-$(VERSION).tgz storage/gcs/build/distributions/gcs-$(VERSION).tgz storage/azure/build/distributions/azure-$(VERSION).tgz
 
 build/distributions/tiered-storage-for-apache-kafka-$(VERSION).tgz:
-	./gradlew build distTar -x test -x integrationTest -x e2e:test
+	./gradlew build distTar -x test -x integrationTest
 
 storage/s3/build/distributions/s3-$(VERSION).tgz:
-	./gradlew build :storage:s3:distTar -x test -x integrationTest -x e2e:test
+	./gradlew build :storage:s3:distTar -x test -x integrationTest
 
 storage/gcs/build/distributions/gcs-$(VERSION).tgz:
-	./gradlew build :storage:gcs:distTar -x test -x integrationTest -x e2e:test
+	./gradlew build :storage:gcs:distTar -x test -x integrationTest
 
 storage/azure/build/distributions/azure-$(VERSION).tgz:
-	./gradlew build :storage:azure:distTar -x test -x integrationTest -x e2e:test
+	./gradlew build :storage:azure:distTar -x test -x integrationTest
 
 .PHONY: docs
 docs:
 	./gradlew :docs:genConfigsDocs
 	./gradlew :docs:genMetricsDocs
 
 test: build
-	./gradlew test -x e2e:test
+	./gradlew test
 
 integration_test: build
-	./gradlew integrationTest
+	./gradlew integrationTest -x :e2e:integrationTest
 
 E2E_TEST=LocalSystem
 
 e2e_test: build
-	./gradlew e2e:test --tests $(E2E_TEST)*
+	./gradlew e2e:integrationTest --tests $(E2E_TEST)*
 
 .PHONY: docker_image
 docker_image: build

diff --git a/e2e/build.gradle b/e2e/build.gradle
@@ -15,26 +15,26 @@
  */
 
 dependencies {
-    testImplementation "org.apache.kafka:kafka-clients:$kafkaVersion"
-    testImplementation "org.apache.kafka:kafka-server-common:$kafkaVersion"
-    testImplementation "org.apache.kafka:kafka-storage:$kafkaVersion"
-    testImplementation "org.apache.kafka:kafka-storage-api:$kafkaVersion"
+    integrationTestImplementation "org.apache.kafka:kafka-clients:$kafkaVersion"
+    integrationTestImplementation "org.apache.kafka:kafka-server-common:$kafkaVersion"
+    integrationTestImplementation "org.apache.kafka:kafka-storage:$kafkaVersion"
+    integrationTestImplementation "org.apache.kafka:kafka-storage-api:$kafkaVersion"
 
-    testImplementation "commons-io:commons-io:$apacheCommonsIOVersion"
-    testImplementation("software.amazon.awssdk:s3:$awsSdkVersion") {
+    integrationTestImplementation "commons-io:commons-io:$apacheCommonsIOVersion"
+    integrationTestImplementation("software.amazon.awssdk:s3:$awsSdkVersion") {
         exclude group: "org.slf4j"
     }
-    implementation "com.google.cloud:google-cloud-storage:$gcpSdkVersion"
+    integrationTestImplementation "com.google.cloud:google-cloud-storage:$gcpSdkVersion"
 
-    testImplementation "org.testcontainers:junit-jupiter:$testcontainersVersion"
-    testImplementation "org.testcontainers:kafka:$testcontainersVersion"
+    integrationTestImplementation "org.testcontainers:junit-jupiter:$testcontainersVersion"
+    integrationTestImplementation "org.testcontainers:kafka:$testcontainersVersion"
 
-    testImplementation "io.aiven:testcontainers-fake-gcs-server:$testcontainersFakeGcsServerVersion"
+    integrationTestImplementation "io.aiven:testcontainers-fake-gcs-server:$testcontainersFakeGcsServerVersion"
 
-    testImplementation platform("com.azure:azure-sdk-bom:$azureSdkVersion")
-    testImplementation "com.azure:azure-storage-blob"
+    integrationTestImplementation platform("com.azure:azure-sdk-bom:$azureSdkVersion")
+    integrationTestImplementation "com.azure:azure-storage-blob"
 
-    testRuntimeOnly "org.slf4j:slf4j-log4j12:$slf4jVersion"
+    integrationTestRuntimeOnly "org.slf4j:slf4j-log4j12:$slf4jVersion"
 }
 
 tasks.named('test') {

diff --git a/...rage/e2e/AzureSingleBrokerDirectTest.java → ...rnal/e2e/AzureSingleBrokerDirectTest.java b/...rage/e2e/AzureSingleBrokerDirectTest.java → ...rnal/e2e/AzureSingleBrokerDirectTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import com.azure.storage.blob.BlobContainerClient;
 import org.junit.jupiter.api.BeforeAll;

diff --git a/...rage/e2e/AzureSingleBrokerSocks5Test.java → ...rnal/e2e/AzureSingleBrokerSocks5Test.java b/...rage/e2e/AzureSingleBrokerSocks5Test.java → ...rnal/e2e/AzureSingleBrokerSocks5Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import com.azure.storage.blob.BlobContainerClient;
 import org.junit.jupiter.api.BeforeAll;

diff --git a/...redstorage/e2e/AzureSingleBrokerTest.java → ...e/internal/e2e/AzureSingleBrokerTest.java b/...redstorage/e2e/AzureSingleBrokerTest.java → ...e/internal/e2e/AzureSingleBrokerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/...torage/e2e/GcsSingleBrokerDirectTest.java → ...ternal/e2e/GcsSingleBrokerDirectTest.java b/...torage/e2e/GcsSingleBrokerDirectTest.java → ...ternal/e2e/GcsSingleBrokerDirectTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import com.google.cloud.storage.BucketInfo;
 import org.junit.jupiter.api.BeforeAll;

diff --git a/...torage/e2e/GcsSingleBrokerSocks5Test.java → ...ternal/e2e/GcsSingleBrokerSocks5Test.java b/...torage/e2e/GcsSingleBrokerSocks5Test.java → ...ternal/e2e/GcsSingleBrokerSocks5Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import com.google.cloud.storage.BucketInfo;
 import org.junit.jupiter.api.BeforeAll;

diff --git a/...ieredstorage/e2e/GcsSingleBrokerTest.java → ...e2e/internal/e2e/GcsSingleBrokerTest.java b/...ieredstorage/e2e/GcsSingleBrokerTest.java → ...e2e/internal/e2e/GcsSingleBrokerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import java.util.List;
 import java.util.stream.Collectors;

diff --git a/...rage/e2e/LocalSystemSingleBrokerTest.java → ...rnal/e2e/LocalSystemSingleBrokerTest.java b/...rage/e2e/LocalSystemSingleBrokerTest.java → ...rnal/e2e/LocalSystemSingleBrokerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import java.io.IOException;
 import java.nio.file.Files;

diff --git a/...dstorage/e2e/S3MinioSingleBrokerTest.java → ...internal/e2e/S3MinioSingleBrokerTest.java b/...dstorage/e2e/S3MinioSingleBrokerTest.java → ...internal/e2e/S3MinioSingleBrokerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import java.net.URI;
 import java.util.ArrayList;

diff --git a/...a/tieredstorage/e2e/SingleBrokerTest.java → ...ge/e2e/internal/e2e/SingleBrokerTest.java b/...a/tieredstorage/e2e/SingleBrokerTest.java → ...ge/e2e/internal/e2e/SingleBrokerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e;
 
 import java.io.File;
 import java.io.IOException;
@@ -50,8 +50,8 @@
 import org.apache.kafka.common.serialization.ByteArrayDeserializer;
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 
-import io.aiven.kafka.tieredstorage.e2e.internal.RemoteLogMetadataTracker;
-import io.aiven.kafka.tieredstorage.e2e.internal.RemoteSegment;
+import io.aiven.kafka.tieredstorage.e2e.internal.e2e.internal.RemoteLogMetadataTracker;
+import io.aiven.kafka.tieredstorage.e2e.internal.e2e.internal.RemoteSegment;
 
 import com.github.dockerjava.api.model.Ulimit;
 import org.apache.commons.io.FileUtils;

diff --git a/...ternal/RemoteLogMetadataDeserializer.java → ...ternal/RemoteLogMetadataDeserializer.java b/...ternal/RemoteLogMetadataDeserializer.java → ...ternal/RemoteLogMetadataDeserializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e.internal;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e.internal;
 
 import org.apache.kafka.common.serialization.Deserializer;
 import org.apache.kafka.server.log.remote.metadata.storage.serialization.RemoteLogMetadataSerde;

diff --git a/...2e/internal/RemoteLogMetadataTracker.java → ...2e/internal/RemoteLogMetadataTracker.java b/...2e/internal/RemoteLogMetadataTracker.java → ...2e/internal/RemoteLogMetadataTracker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e.internal;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e.internal;
 
 import java.time.Duration;
 import java.util.Comparator;

diff --git a/...edstorage/e2e/internal/RemoteSegment.java → .../internal/e2e/internal/RemoteSegment.java b/...edstorage/e2e/internal/RemoteSegment.java → .../internal/e2e/internal/RemoteSegment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.aiven.kafka.tieredstorage.e2e.internal;
+package io.aiven.kafka.tieredstorage.e2e.internal.e2e.internal;
 
 import java.util.Objects;
 

diff --git a/e2e/src/test/resources/log4j.properties → ...tegration-test/resources/log4j.properties b/e2e/src/test/resources/log4j.properties → ...tegration-test/resources/log4j.properties