refactor test pipeline

eclipse-tractusx · Oct 17, 2024 · 49b9889 · 49b9889
1 parent daf0cdb
commit 49b9889
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 62 deletions.
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -100,20 +100,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        variant: [ { dir: edc-tests/edc-controlplane/catalog-tests },
-                   { dir: edc-tests/edc-controlplane/edr-api-tests },
-                   { dir: edc-tests/edc-controlplane/iatp-tests },
-                   { dir: edc-tests/edc-controlplane/policy-tests },
-                   { dir: edc-tests/edc-controlplane/transfer-tests },
-                   { dir: edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests }
+        variant: [
+          { dir: edc-tests/edc-controlplane/catalog-tests },
+          { dir: edc-tests/edc-controlplane/edr-api-tests },
+          { dir: edc-tests/edc-controlplane/iatp-tests },
+          { dir: edc-tests/edc-controlplane/policy-tests },
+          { dir: edc-tests/edc-controlplane/transfer-tests },
+          { dir: edc-tests/edc-dataplane/edc-dataplane-tokenrefresh-tests },
+          { dir: edc-tests/edc-dataplane/cloud-transfer-tests },
+          { dir: edc-tests/edc-end2end },
         ]
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-java
 
       - name: Run E2E tests (${{ matrix.variant.dir }})
         run: |
-          ./gradlew compileJava compileTestJava --refresh-dependencies
+          ./gradlew compileJava compileTestJava
           ./gradlew -p ${{ matrix.variant.dir }} test -DincludeTags="EndToEndTest" -PverboseTest=true
 
   postgres-tests:
@@ -124,20 +127,3 @@ jobs:
 
       - name: Run Postgresql E2E tests
         run: ./gradlew test -DincludeTags="PostgresqlIntegrationTest" --refresh-dependencies
-
-  cloud-transfer-tests:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/setup-java
-
-      - name: Run Azure/S3 dataplane tests
-        run: |
-          ./gradlew compileJava compileTestJava
-          ./gradlew -p edc-tests/edc-dataplane test -DincludeTags="CloudTransferTest"
-
-      - name: Run Azure/S3 End-To-End tests
-        run: |
-          ./gradlew compileJava compileTestJava
-          ./gradlew -p edc-tests/edc-end2end test -DincludeTags="EndToEndTest"
diff --git a/...ests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureToAzureTest.java b/...ests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/AzureToAzureTest.java
@@ -23,6 +23,7 @@
 import io.restassured.http.ContentType;
 import jakarta.json.Json;
 import jakarta.json.JsonObjectBuilder;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.edc.junit.extensions.EmbeddedRuntime;
 import org.eclipse.edc.junit.extensions.RuntimeExtension;
 import org.eclipse.edc.junit.extensions.RuntimePerClassExtension;
@@ -74,7 +75,7 @@
  */
 @SuppressWarnings("resource")
 @Testcontainers
-@CloudTransferTest
+@EndToEndTest
 public class AzureToAzureTest {
 
     private static final int PROVIDER_CONTROL_PORT = getFreePort();

diff --git a/...sts/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/CloudTransferTest.java b/...sts/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/CloudTransferTest.java
diff --git a/...-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MultiCloudTest.java b/...-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/MultiCloudTest.java
@@ -27,6 +27,7 @@
 import org.eclipse.edc.aws.s3.AwsClientProviderImpl;
 import org.eclipse.edc.aws.s3.S3ClientRequest;
 import org.eclipse.edc.aws.s3.spi.S3BucketSchema;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.edc.junit.extensions.EmbeddedRuntime;
 import org.eclipse.edc.junit.extensions.RuntimeExtension;
 import org.eclipse.edc.junit.extensions.RuntimePerClassExtension;
@@ -64,7 +65,7 @@
 import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
 
 @Testcontainers
-@CloudTransferTest
+@EndToEndTest
 public class MultiCloudTest {
     // S3 test constants
     public static final String REGION = Region.US_WEST_2.id();

diff --git a/...sfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/S3ToS3Test.java b/...sfer-tests/src/test/java/org/eclipse/tractusx/edc/dataplane/transfer/test/S3ToS3Test.java
@@ -27,6 +27,7 @@
 import org.eclipse.edc.aws.s3.AwsClientProviderImpl;
 import org.eclipse.edc.aws.s3.S3ClientRequest;
 import org.eclipse.edc.aws.s3.spi.S3BucketSchema;
+import org.eclipse.edc.junit.annotations.EndToEndTest;
 import org.eclipse.edc.junit.extensions.EmbeddedRuntime;
 import org.eclipse.edc.junit.extensions.RuntimeExtension;
 import org.eclipse.edc.junit.extensions.RuntimePerClassExtension;
@@ -82,7 +83,7 @@
  * It spins up a fully-fledged dataplane and issues the DataFlowStartMessage via the data plane's Control API
  */
 @Testcontainers
-@CloudTransferTest
+@EndToEndTest
 public class S3ToS3Test {
 
     private static final int PROVIDER_CONTROL_PORT = getFreePort(); // port of the control api