From 8dfd665e6d65be2e9d5baec953c1c7eff1848a95 Mon Sep 17 00:00:00 2001
From: Christophe '116' Loiseau <116@lab0.net>
Date: Wed, 24 Apr 2024 15:59:37 +0200
Subject: [PATCH] Publish to Azure

---
 .github/workflows/publish.yml                  |  9 ++++++---
 build.gradle.kts                               | 18 ++++++++++++++++++
 .../TransferProcessEventDispatchTest.java      |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4a8ddaac91f..43f2034c47e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -23,17 +23,20 @@ jobs:
       - name: Debug
         run: echo ${{ github.ref }} ; echo ${GITHUB_REF}
 
+      - name: Check
+        run: ./gradlew check
+
       - name: "Gradle: Publish"
         if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/sovity/') }}
         run: |
           if [[ "$GITHUB_REF" == "refs/tags/v"* ]]; then
             GRADLE_ARGS="-Pversion=${GITHUB_REF#refs/tags/v}"
+            ./gradlew --parallel "$GRADLE_ARGS" publishAllPublicationsToAzurePackagesRepository
           elif [[ "$GITHUB_REF" == "refs/heads/sovity/"* ]]; then
             GRADLE_ARGS="-Pversion=${GITHUB_REF#refs/heads/sovity/}.0.$(date '+%Y%m%d.%H%M%S')"
-          elif [[ "$GITHUB_REF" == "refs/pull/"* ]]; then
-            GRADLE_ARGS="-Pversion=0.PR-$(echo $GITHUB_REF | cut -d '/' -f 3)"
+            ./gradlew --parallel "$GRADLE_ARGS" publishAllPublicationsToAzureTestPackagesRepository
           fi
-          ./gradlew "$GRADLE_ARGS" check publishAllPublicationsToGitHubPackagesRepository
         env:
           USERNAME: ${{ github.actor }}
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
index 64912167498..7f0051cfec9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -86,6 +86,24 @@ subprojects {
                     password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
                 }
             }
+
+            maven {
+                name = "AzureTestPackages"
+                url = uri("https://pkgs.dev.azure.com/sovity/Test/_packaging/test/maven/v1")
+                credentials {
+                    username = "sovity"
+                    password = project.findProperty("azure.token") as String? ?: System.getenv("AZURE_TOKEN")
+                }
+            }
+
+            maven {
+                name = "AzurePackages"
+                url = uri("https://pkgs.dev.azure.com/sovity/41799556-91c8-4df6-8ddb-4471d6f15953/_packaging/core-edc/maven/v1")
+                credentials {
+                    username = "sovity"
+                    password = project.findProperty("azure.token") as String? ?: System.getenv("AZURE_TOKEN")
+                }
+            }
         }
     }
 }
diff --git a/core/control-plane/control-plane-aggregate-services/src/test/java/org/eclipse/edc/connector/service/transferprocess/TransferProcessEventDispatchTest.java b/core/control-plane/control-plane-aggregate-services/src/test/java/org/eclipse/edc/connector/service/transferprocess/TransferProcessEventDispatchTest.java
index 38a9c3cf2c2..a4605eab679 100644
--- a/core/control-plane/control-plane-aggregate-services/src/test/java/org/eclipse/edc/connector/service/transferprocess/TransferProcessEventDispatchTest.java
+++ b/core/control-plane/control-plane-aggregate-services/src/test/java/org/eclipse/edc/connector/service/transferprocess/TransferProcessEventDispatchTest.java
@@ -74,7 +74,7 @@
 @ExtendWith(EdcExtension.class)
 public class TransferProcessEventDispatchTest {
 
-    public static final Duration TIMEOUT = Duration.ofSeconds(30);
+    public static final Duration TIMEOUT = Duration.ofSeconds(60);
     private final EventSubscriber eventSubscriber = mock(EventSubscriber.class);
 
     @NotNull